diff --git a/modules/trustxBidAdapter.js b/modules/trustxBidAdapter.js
index 66574e4fe57..141ed79cfca 100644
--- a/modules/trustxBidAdapter.js
+++ b/modules/trustxBidAdapter.js
@@ -5,8 +5,7 @@ import { VIDEO, BANNER } from '../src/mediaTypes.js';
 import { config } from '../src/config.js';
 
 const BIDDER_CODE = 'trustx';
-const ENDPOINT_URL = 'https://sofia.trustx.org/hb';
-const NEW_ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson?sp=trustx';
+const ENDPOINT_URL = 'https://grid.bidswitch.net/hbjson?sp=trustx';
 const ADDITIONAL_SYNC_URL = 'https://x.bidswitch.net/sync?ssp=themediagrid';
 const TIME_TO_LIVE = 360;
 const ADAPTER_SYNC_URL = 'https://sofia.trustx.org/push_sync';
@@ -39,40 +38,217 @@ export const spec = {
    * Make a server request from the list of BidRequests.
    *
    * @param {BidRequest[]} validBidRequests - an array of bids
-   * @param {bidderRequest} - bidder request object
+   * @param {bidderRequest} bidderRequest bidder request object
    * @return ServerRequest Info describing the request to the server.
    */
   buildRequests: function(validBidRequests, bidderRequest) {
-    const bids = validBidRequests || [];
-    const newFormatBids = [];
-    const oldFormatBids = [];
-    const requests = [];
-    bids.forEach(bid => {
-      if (bid.params.useNewFormat) {
-        newFormatBids.push(bid);
-      } else {
-        oldFormatBids.push(bid);
+    if (!validBidRequests.length) {
+      return null;
+    }
+    let pageKeywords = null;
+    let jwpseg = null;
+    let permutiveseg = null;
+    let content = null;
+    let schain = null;
+    let userId = null;
+    let userIdAsEids = null;
+    let user = null;
+    let userExt = null;
+    let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
+
+    const referer = refererInfo ? encodeURIComponent(refererInfo.referer) : '';
+    const imp = [];
+    const bidsMap = {};
+
+    validBidRequests.forEach((bid) => {
+      if (!bidderRequestId) {
+        bidderRequestId = bid.bidderRequestId;
+      }
+      if (!auctionId) {
+        auctionId = bid.auctionId;
+      }
+      if (!schain) {
+        schain = bid.schain;
+      }
+      if (!userId) {
+        userId = bid.userId;
+      }
+      if (!userIdAsEids) {
+        userIdAsEids = bid.userIdAsEids;
+      }
+      const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
+      bidsMap[bidId] = bid;
+      const bidFloor = _getFloor(mediaTypes || {}, bid);
+      if (rtd) {
+        const jwTargeting = rtd.jwplayer && rtd.jwplayer.targeting;
+        if (jwTargeting) {
+          if (!jwpseg && jwTargeting.segments) {
+            jwpseg = jwTargeting.segments;
+          }
+          if (!content && jwTargeting.content) {
+            content = jwTargeting.content;
+          }
+        }
+        const permutiveTargeting = rtd.p_standard && rtd.p_standard.targeting;
+        if (!permutiveseg && permutiveTargeting && permutiveTargeting.segments) {
+          permutiveseg = permutiveTargeting.segments;
+        }
+      }
+      let impObj = {
+        id: bidId,
+        tagid: uid.toString(),
+        ext: {
+          divid: adUnitCode
+        }
+      };
+
+      if (!utils.isEmpty(keywords)) {
+        if (!pageKeywords) {
+          pageKeywords = keywords;
+        }
+        impObj.ext.bidder = { keywords };
+      }
+
+      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 (impObj.banner || impObj.video) {
+        imp.push(impObj);
       }
     });
-    if (newFormatBids.length) {
-      const newFormatRequests = newFormatRequest(newFormatBids, bidderRequest);
-      if (newFormatRequests) {
-        requests.push(newFormatRequests);
+
+    const source = {
+      tid: auctionId,
+      ext: {
+        wrapper: 'Prebid_js',
+        wrapper_version: '$prebid.version$'
       }
+    };
+
+    if (schain) {
+      source.ext.schain = schain;
+    }
+
+    const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
+    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+
+    let request = {
+      id: bidderRequestId,
+      site: {
+        page: referer
+      },
+      tmax,
+      source,
+      imp
+    };
+
+    if (content) {
+      request.site.content = content;
     }
-    if (oldFormatBids.length) {
-      const oldFormatRequests = oldFormatRequest(oldFormatBids, bidderRequest);
-      if (oldFormatRequests) {
-        requests.push(oldFormatRequests);
+
+    const userData = [];
+    addSegments('iow_labs_pub_data', 'jwpseg', jwpseg, userData);
+    addSegments('permutive', 'p_standard', permutiveseg, userData, 'permutive.com');
+
+    if (userData.length) {
+      user = {
+        data: userData
+      };
+    }
+
+    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;
+    }
+
+    if (user) {
+      request.user = user;
+    }
+
+    const userKeywords = utils.deepAccess(config.getConfig('ortb2.user'), 'keywords') || null;
+    const siteKeywords = utils.deepAccess(config.getConfig('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
+        };
+      }
+    }
+
+    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;
     }
-    return requests;
+
+    return {
+      method: 'POST',
+      url: ENDPOINT_URL,
+      data: JSON.stringify(request),
+      bidsMap
+    };
   },
   /**
    * 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, RendererConst = Renderer) {
@@ -124,16 +300,6 @@ export const spec = {
   }
 }
 
-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);
@@ -151,23 +317,8 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst) {
   if (!serverBid.auid) errorMessage = LOG_ERROR_MESS.noAuid + JSON.stringify(serverBid);
   if (!serverBid.adm) errorMessage = LOG_ERROR_MESS.noAdm + JSON.stringify(serverBid);
   else {
-    const { bidsMap, priceType, newFormat } = bidRequest;
-    let bid;
-    let slot;
-    if (newFormat) {
-      bid = bidsMap[serverBid.impid];
-    } else {
-      const awaitingBids = bidsMap[serverBid.auid];
-      if (awaitingBids) {
-        const sizeId = `${serverBid.w}x${serverBid.h}`;
-        if (awaitingBids[sizeId]) {
-          slot = awaitingBids[sizeId][0];
-          bid = slot.bids.shift();
-        }
-      } else {
-        errorMessage = LOG_ERROR_MESS.noPlacementCode + serverBid.auid;
-      }
-    }
+    const { bidsMap } = bidRequest;
+    const bid = bidsMap[serverBid.impid];
 
     if (!errorMessage && bid) {
       const bidResponse = {
@@ -177,7 +328,7 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst) {
         height: serverBid.h,
         creativeId: serverBid.auid, // bid.bidId,
         currency: 'USD',
-        netRevenue: newFormat ? false : priceType !== 'gross',
+        netRevenue: false,
         ttl: TIME_TO_LIVE,
         dealId: serverBid.dealid,
         meta: {
@@ -203,21 +354,6 @@ function _addBidResponse(serverBid, bidRequest, bidResponses, RendererConst) {
 
       bidResponses.push(bidResponse);
     }
-
-    if (slot && !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];
-          }
-        }
-      });
-    }
   }
   if (errorMessage) {
     utils.logError(errorMessage);
@@ -313,6 +449,51 @@ function addSegments(name, segName, segments, data, bidConfigName) {
   }
 }
 
+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;
+}
+
 /**
  * Gets bidfloor
  * @param {Object} mediaTypes
@@ -340,319 +521,4 @@ function _getFloor (mediaTypes, bid) {
   return floor;
 }
 
-function newFormatRequest(validBidRequests, bidderRequest) {
-  if (!validBidRequests.length) {
-    return null;
-  }
-  let pageKeywords = null;
-  let jwpseg = null;
-  let permutiveseg = null;
-  let content = null;
-  let schain = null;
-  let userId = null;
-  let userIdAsEids = null;
-  let user = null;
-  let userExt = null;
-  let {bidderRequestId, auctionId, gdprConsent, uspConsent, timeout, refererInfo} = bidderRequest || {};
-
-  const referer = refererInfo ? encodeURIComponent(refererInfo.referer) : '';
-  const imp = [];
-  const bidsMap = {};
-
-  validBidRequests.forEach((bid) => {
-    if (!bidderRequestId) {
-      bidderRequestId = bid.bidderRequestId;
-    }
-    if (!auctionId) {
-      auctionId = bid.auctionId;
-    }
-    if (!schain) {
-      schain = bid.schain;
-    }
-    if (!userId) {
-      userId = bid.userId;
-    }
-    if (!userIdAsEids) {
-      userIdAsEids = bid.userIdAsEids;
-    }
-    const {params: {uid, keywords}, mediaTypes, bidId, adUnitCode, rtd} = bid;
-    bidsMap[bidId] = bid;
-    if (!pageKeywords && !utils.isEmpty(keywords)) {
-      pageKeywords = utils.transformBidderParamKeywords(keywords);
-    }
-    const bidFloor = _getFloor(mediaTypes || {}, bid);
-    if (rtd) {
-      const jwTargeting = rtd.jwplayer && rtd.jwplayer.targeting;
-      if (jwTargeting) {
-        if (!jwpseg && jwTargeting.segments) {
-          jwpseg = jwTargeting.segments;
-        }
-        if (!content && jwTargeting.content) {
-          content = jwTargeting.content;
-        }
-      }
-      const permutiveTargeting = rtd.p_standard && rtd.p_standard.targeting;
-      if (!permutiveseg && permutiveTargeting && permutiveTargeting.segments) {
-        permutiveseg = permutiveTargeting.segments;
-      }
-    }
-    let impObj = {
-      id: bidId,
-      tagid: uid.toString(),
-      ext: {
-        divid: adUnitCode
-      }
-    };
-
-    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 (impObj.banner || impObj.video) {
-      imp.push(impObj);
-    }
-  });
-
-  const source = {
-    tid: auctionId,
-    ext: {
-      wrapper: 'Prebid_js',
-      wrapper_version: '$prebid.version$'
-    }
-  };
-
-  if (schain) {
-    source.ext.schain = schain;
-  }
-
-  const bidderTimeout = config.getConfig('bidderTimeout') || timeout;
-  const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
-
-  let request = {
-    id: bidderRequestId,
-    site: {
-      page: referer
-    },
-    tmax,
-    source,
-    imp
-  };
-
-  if (content) {
-    request.site.content = content;
-  }
-
-  const userData = [];
-  addSegments('iow_labs_pub_data', 'jwpseg', jwpseg, userData);
-  addSegments('permutive', 'p_standard', permutiveseg, userData, 'permutive.com');
-
-  if (userData.length) {
-    user = {
-      data: userData
-    };
-  }
-
-  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;
-  }
-
-  if (user) {
-    request.user = user;
-  }
-
-  const configKeywords = utils.transformBidderParamKeywords({
-    'user': utils.deepAccess(config.getConfig('ortb2.user'), 'keywords') || null,
-    'context': utils.deepAccess(config.getConfig('ortb2.site'), 'keywords') || null
-  });
-
-  if (configKeywords.length) {
-    pageKeywords = (pageKeywords || []).concat(configKeywords);
-  }
-
-  if (pageKeywords && pageKeywords.length > 0) {
-    pageKeywords.forEach(deleteValues);
-  }
-
-  if (pageKeywords) {
-    request.ext = {
-      keywords: pageKeywords
-    };
-  }
-
-  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;
-  }
-
-  return {
-    method: 'POST',
-    url: NEW_ENDPOINT_URL,
-    data: JSON.stringify(request),
-    newFormat: true,
-    bidsMap
-  };
-}
-
-function oldFormatRequest(validBidRequests, bidderRequest) {
-  const auids = [];
-  const bidsMap = {};
-  const slotsMapByUid = {};
-  const sizeMap = {};
-  const bids = validBidRequests || [];
-  let priceType = 'net';
-  let jwpseg = null;
-  let permutiveseg = null;
-  let pageKeywords;
-  let reqId;
-
-  bids.forEach(bid => {
-    if (bid.params.priceType === 'gross') {
-      priceType = 'gross';
-    }
-    reqId = bid.bidderRequestId;
-    const {params: {uid}, adUnitCode, rtd} = 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 (rtd) {
-      const jwTargeting = rtd.jwplayer && rtd.jwplayer.targeting;
-      if (jwTargeting) {
-        if (!jwpseg && jwTargeting.segments) {
-          jwpseg = jwTargeting.segments;
-        }
-      }
-      const permutiveTargeting = rtd.p_standard && rtd.p_standard.targeting;
-      if (!permutiveseg && permutiveTargeting && permutiveTargeting.segments) {
-        permutiveseg = permutiveTargeting.segments;
-      }
-    }
-
-    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 segmentsData = [];
-  addSegments('iow_labs_pub_data', 'jwpseg', jwpseg, segmentsData);
-  addSegments('permutive', 'p_standard', permutiveseg, segmentsData, 'permutive.com');
-
-  if (segmentsData.length) {
-    if (!pageKeywords) {
-      pageKeywords = [];
-    }
-    segmentsData.forEach(({segment}) => {
-      if (segment.length) {
-        pageKeywords.push({
-          key: segment[0].name,
-          value: segment.map(({value}) => value)
-        });
-      }
-    });
-  }
-
-  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,
-    priceType
-  };
-}
-
 registerBidder(spec);
diff --git a/modules/trustxBidAdapter.md b/modules/trustxBidAdapter.md
index e891df8f161..f29d47eaf36 100644
--- a/modules/trustxBidAdapter.md
+++ b/modules/trustxBidAdapter.md
@@ -14,53 +14,60 @@ TrustX Bid Adapter supports Banner and Video (instream and outstream).
     var adUnits = [
            {
                code: 'test-div',
-               sizes: [[300, 250]],
+               mediaTypes: {
+                   banner: {
+                       sizes: [[300, 250]],
+                   }    
+               },
                bids: [
                    {
                        bidder: "trustx",
                        params: {
-                           uid: '44',
-                           priceType: 'gross' // by default is 'net'
+                           uid: '58851',
                        }
                    }
                ]
            },{
                code: 'test-div',
-               sizes: [[728, 90]],
+               mediaTypes: {
+                   banner: {
+                       sizes: [[728, 90],[300, 250]],
+                   }    
+               },
                bids: [
                    {
                        bidder: "trustx",
                        params: {
-                           uid: 45,
-                           priceType: 'gross',
+                           uid: 58851,
                            keywords: {
-                               brandsafety: ['disaster'],
-                               topic: ['stress', 'fear']
+                               site: {
+                                   publisher: {
+                                       name: 'someKeywordsName',
+                                       brandsafety: ['disaster'],
+                                       topic: ['stress', 'fear'] 
+                                   }
+                               }
                            }
                        }
                    }
                ]
            },{
                code: 'test-div',
-               sizes: [[640, 360]],
-               mediaTypes: { video: {} },
-               bids: [
-                   {
-                       bidder: "trustx",
-                       params: {
-                           uid: 7697
-                       }
+               mediaTypes: { 
+                   video: {
+                       context: 'instream',
+                       playerSize: [640, 360],
+                       mimes: ['video/mp4'],
+                       protocols: [1, 2, 3, 4, 5, 6, 7, 8],
+                       playbackmethod: [2],
+                       skip: 1
                    }
-               ]
-           },{
-               code: 'test-div',
-               sizes: [[300, 250]],
+               },
                bids: [
                    {
                        bidder: "trustx",
                        params: {
-                           uid: '58851',
-                           useNewFormat: true
+                           uid: 7697
                        }
                    }
                ]
diff --git a/test/spec/modules/trustxBidAdapter_spec.js b/test/spec/modules/trustxBidAdapter_spec.js
index a8caed3ad0e..a32943eef80 100644
--- a/test/spec/modules/trustxBidAdapter_spec.js
+++ b/test/spec/modules/trustxBidAdapter_spec.js
@@ -40,229 +40,6 @@ describe('TrustXAdapter', 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;
-    }
-
-    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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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)[0];
-      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'
-      }]);
-    });
-
-    it('should attach rtd segments as keywords', function () {
-      const bidRequestWithKeywords = [].concat(bidRequests);
-      bidRequestWithKeywords[1] = Object.assign({},
-        bidRequests[1],
-        {
-          rtd: {
-            p_standard: {
-              targeting: {
-                segments: ['perm_seg_1', 'perm_seg_2']
-              }
-            },
-            jwplayer: {
-              targeting: {
-                segments: ['jwp_seg_1', 'jwp_seg_2']
-              }
-            }
-          }
-        }
-      );
-
-      const request = spec.buildRequests(bidRequestWithKeywords, bidderRequest)[0];
-      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': 'jwpseg',
-        'value': ['jwp_seg_1', 'jwp_seg_2']
-      }, {
-        'key': 'p_standard',
-        'value': ['perm_seg_1', 'perm_seg_2']
-      }]);
-    });
-  });
-
-  describe('buildRequests with new format', function () {
     function parseRequest(data) {
       return JSON.parse(data);
     }
@@ -280,7 +57,6 @@ describe('TrustXAdapter', function () {
         'params': {
           'uid': '43',
           'bidFloor': 1.25,
-          'useNewFormat': true
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
@@ -297,7 +73,6 @@ describe('TrustXAdapter', function () {
         'bidder': 'trustx',
         'params': {
           'uid': '44',
-          'useNewFormat': true
         },
         'adUnitCode': 'adunit-code-1',
         'sizes': [[300, 250], [300, 600]],
@@ -309,7 +84,6 @@ describe('TrustXAdapter', function () {
         'bidder': 'trustx',
         'params': {
           'uid': '45',
-          'useNewFormat': true
         },
         'adUnitCode': 'adunit-code-2',
         'sizes': [[728, 90]],
@@ -327,7 +101,6 @@ describe('TrustXAdapter', function () {
         'bidder': 'trustx',
         'params': {
           'uid': '41',
-          'useNewFormat': true
         },
         'adUnitCode': 'adunit-code-2',
         'sizes': [[728, 90]],
@@ -347,7 +120,7 @@ describe('TrustXAdapter', function () {
     ];
 
     it('should attach valid params to the tag', function () {
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -375,7 +148,7 @@ describe('TrustXAdapter', function () {
     });
 
     it('make possible to process request without mediaTypes', function () {
-      const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest)[0];
+      const request = spec.buildRequests([bidRequests[0], bidRequests[1]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -412,7 +185,7 @@ describe('TrustXAdapter', function () {
     });
 
     it('should attach valid params to the video tag', function () {
-      const request = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest)[0];
+      const request = spec.buildRequests(bidRequests.slice(0, 3), bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -458,7 +231,7 @@ describe('TrustXAdapter', function () {
     });
 
     it('should support mixed mediaTypes', function () {
-      const request = spec.buildRequests(bidRequests, bidderRequest)[0];
+      const request = spec.buildRequests(bidRequests, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.deep.equal({
@@ -519,7 +292,7 @@ describe('TrustXAdapter', function () {
 
     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)[0];
+      const request = spec.buildRequests(bidRequests, gdprBidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -532,7 +305,7 @@ describe('TrustXAdapter', function () {
 
     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)[0];
+      const request = spec.buildRequests(bidRequests, bidderRequestWithUSP);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('regs');
@@ -565,7 +338,7 @@ describe('TrustXAdapter', function () {
           userIdAsEids: eids
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest)[0];
+      const request = spec.buildRequests(bidRequestsWithUserIds, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -589,7 +362,7 @@ describe('TrustXAdapter', function () {
           schain: schain
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithSChain, bidderRequest)[0];
+      const request = spec.buildRequests(bidRequestsWithSChain, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('source');
@@ -613,7 +386,7 @@ describe('TrustXAdapter', function () {
           }
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest)[0];
+      const request = spec.buildRequests(bidRequestsWithJwTargeting, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -641,7 +414,7 @@ describe('TrustXAdapter', function () {
           }
         }, bid);
       });
-      const request = spec.buildRequests(bidRequestsWithPermutiveTargeting, bidderRequest)[0];
+      const request = spec.buildRequests(bidRequestsWithPermutiveTargeting, bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload).to.have.property('user');
@@ -656,18 +429,82 @@ describe('TrustXAdapter', function () {
 
     it('should contain the keyword values if it present in ortb2.(site/user)', function () {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
-        arg => arg === 'ortb2.user' ? {'keywords': 'foo'} : (arg === 'ortb2.site' ? {'keywords': 'bar'} : null));
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+        arg => arg === 'ortb2.user' ? {'keywords': 'foo,any'} : (arg === 'ortb2.site' ? {'keywords': 'bar'} : null));
+      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);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
-      expect(payload.ext.keywords).to.deep.equal([{'key': 'user', 'value': ['foo']}, {'key': 'context', 'value': ['bar']}]);
+      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' }
+              ]
+            }
+          ]
+        }
+      });
       getConfigStub.restore();
     });
 
     it('shold be right tmax when timeout in config is less then timeout in bidderRequest', function() {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'bidderTimeout' ? 2000 : null);
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.tmax).to.equal(2000);
@@ -676,7 +513,7 @@ describe('TrustXAdapter', function () {
     it('shold be right tmax when timeout in bidderRequest is less then timeout in config', function() {
       const getConfigStub = sinon.stub(config, 'getConfig').callsFake(
         arg => arg === 'bidderTimeout' ? 5000 : null);
-      const request = spec.buildRequests([bidRequests[0]], bidderRequest)[0];
+      const request = spec.buildRequests([bidRequests[0]], bidderRequest);
       expect(request.data).to.be.an('string');
       const payload = parseRequest(request.data);
       expect(payload.tmax).to.equal(3000);
@@ -694,7 +531,7 @@ describe('TrustXAdapter', function () {
         }
       }, bidRequests[1]);
       it('should return the value from getFloor if present', function () {
-        const request = spec.buildRequests([bidRequest], bidderRequest)[0];
+        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);
@@ -703,7 +540,7 @@ describe('TrustXAdapter', function () {
         const bidfloor = 0.80;
         const bidRequestsWithFloor = { ...bidRequest };
         bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
-        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest)[0];
+        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);
@@ -712,7 +549,7 @@ describe('TrustXAdapter', function () {
         const bidfloor = 1.80;
         const bidRequestsWithFloor = { ...bidRequest };
         bidRequestsWithFloor.params = Object.assign({bidFloor: bidfloor}, bidRequestsWithFloor.params);
-        const request = spec.buildRequests([bidRequestsWithFloor], bidderRequest)[0];
+        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);
@@ -722,10 +559,10 @@ describe('TrustXAdapter', function () {
 
   describe('interpretResponse', function () {
     const responses = [
-      {'bid': [{'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300, 'adomain': ['somedomain.com']}], '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': [{'impid': '659423fff799cb', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300, 'adomain': ['somedomain.com']}], 'seat': '1'},
+      {'bid': [{'impid': '4dff80cc4ee346', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 44, 'h': 600, 'w': 300}], 'seat': '1'},
+      {'bid': [{'impid': '5703af74d0472a', 'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 43, 'h': 90, 'w': 728}], 'seat': '1'},
+      {'bid': [{'impid': '659423faac49cb', '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'},
@@ -746,7 +583,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '1cbd2feafe5e8b',
         }
       ];
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '659423fff799cb',
@@ -758,7 +595,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 1</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': ['somedomain.com']
@@ -779,7 +616,7 @@ describe('TrustXAdapter', function () {
           },
           'adUnitCode': 'adunit-code-1',
           'sizes': [[300, 250], [300, 600]],
-          'bidId': '300bfeb0d71a5b',
+          'bidId': '659423fff799cb',
           'bidderRequestId': '2c2bb1972df9a',
           'auctionId': '1fa09aee5c8c99',
         },
@@ -806,10 +643,10 @@ describe('TrustXAdapter', function () {
           'auctionId': '1fa09aee5c8c99',
         }
       ];
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
-          'requestId': '300bfeb0d71a5b',
+          'requestId': '659423fff799cb',
           'cpm': 1.15,
           'creativeId': 43,
           'dealId': undefined,
@@ -818,7 +655,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 1</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': ['somedomain.com']
@@ -834,7 +671,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 2</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -850,7 +687,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 3</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -898,18 +735,18 @@ describe('TrustXAdapter', function () {
           'auctionId': '1fa09aee5c84d34',
         }
       ];
-      const request = spec.buildRequests(bidRequests)[0];
+      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'},
+        {'bid': [{'impid': '2164be6358b9', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '4e111f1b66e4', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 44, 'h': 600, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '26d6f897b516', 'price': 0.15, 'adm': '<div>test content 3</div>', 'auid': 43, 'h': 90, 'w': 728}], 'seat': '1'},
+        {'bid': [{'impid': '326bde7fbf69', 'price': 0.15, 'adm': '<div>test content 4</div>', 'auid': 43, 'h': 600, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '1751cd90161', 'price': 0.5, 'adm': '<div>test content 5</div>', 'auid': 44, 'h': 600, 'w': 350}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -968,7 +805,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '32a1f276cb87cb8',
         }
       ];
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '2164be6358b9',
@@ -980,7 +817,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 1</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -996,7 +833,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 2</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -1012,7 +849,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 3</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -1028,7 +865,23 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 4</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
+          'ttl': 360,
+          'meta': {
+            'advertiserDomains': []
+          },
+        },
+        {
+          'requestId': '1751cd90161',
+          'cpm': 0.5,
+          'creativeId': 44,
+          'dealId': undefined,
+          'width': 350,
+          'height': 600,
+          'ad': '<div>test content 5</div>',
+          'currency': 'USD',
+          'mediaType': 'banner',
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -1042,8 +895,8 @@ describe('TrustXAdapter', function () {
 
     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'},
+        {'bid': [{'impid': '5126e301f4be', 'price': 1.15, 'adm': '<div>test content 1</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
+        {'bid': [{'impid': '57b2ebe70e16', 'price': 0.5, 'adm': '<div>test content 2</div>', 'auid': 43, 'h': 250, 'w': 300}], 'seat': '1'},
       ];
       const bidRequests = [
         {
@@ -1080,7 +933,7 @@ describe('TrustXAdapter', function () {
           'auctionId': '35bcbc0f7e79c',
         }
       ];
-      const request = spec.buildRequests(bidRequests)[0];
+      const request = spec.buildRequests(bidRequests);
       const expectedResponse = [
         {
           'requestId': '5126e301f4be',
@@ -1092,7 +945,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 1</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -1108,7 +961,7 @@ describe('TrustXAdapter', function () {
           'ad': '<div>test content 2</div>',
           'currency': 'USD',
           'mediaType': 'banner',
-          'netRevenue': true,
+          'netRevenue': false,
           'ttl': 360,
           'meta': {
             'advertiserDomains': []
@@ -1157,10 +1010,10 @@ describe('TrustXAdapter', function () {
       }
     ];
     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'}
+      {'bid': [{'impid': '57dfefb80eca', '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': [{'impid': '5126e301f4be', '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)[0];
+    const request = spec.buildRequests(bidRequests);
     const expectedResponse = [
       {
         'requestId': '57dfefb80eca',
@@ -1171,7 +1024,7 @@ describe('TrustXAdapter', function () {
         'height': 600,
         'currency': 'USD',
         'mediaType': 'video',
-        'netRevenue': true,
+        'netRevenue': false,
         'ttl': 360,
         'meta': {
           'advertiserDomains': []
@@ -1238,11 +1091,11 @@ describe('TrustXAdapter', function () {
       }
     ];
     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'}
+      {'bid': [{'impid': 'e6e65553fc8', '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': [{'impid': 'c8fdcb3f269f', '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': [{'impid': '1de036c37685', '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)[0];
+    const request = spec.buildRequests(bidRequests);
     const expectedResponse = [
       {
         'requestId': 'e6e65553fc8',
@@ -1253,7 +1106,7 @@ describe('TrustXAdapter', function () {
         'height': 600,
         'currency': 'USD',
         'mediaType': 'video',
-        'netRevenue': true,
+        'netRevenue': false,
         'ttl': 360,
         'meta': {
           'advertiserDomains': []
@@ -1273,7 +1126,7 @@ describe('TrustXAdapter', function () {
         'height': 250,
         'currency': 'USD',
         'mediaType': 'video',
-        'netRevenue': true,
+        'netRevenue': false,
         'ttl': 360,
         'meta': {
           'advertiserDomains': []
@@ -1293,7 +1146,7 @@ describe('TrustXAdapter', function () {
         'height': 250,
         'currency': 'USD',
         'mediaType': 'video',
-        'netRevenue': true,
+        'netRevenue': false,
         'ttl': 360,
         'meta': {
           'advertiserDomains': []