diff --git a/modules/adkernelAdnBidAdapter.js b/modules/adkernelAdnBidAdapter.js
index 28fb564320d..c02a0cb138f 100644
--- a/modules/adkernelAdnBidAdapter.js
+++ b/modules/adkernelAdnBidAdapter.js
@@ -80,7 +80,7 @@ export const spec = {
 
   code: 'adkernelAdn',
 
-  supportedMediaTypes: [VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   isBidRequestValid: function(bidRequest) {
     return 'params' in bidRequest && (typeof bidRequest.params.host === 'undefined' || typeof bidRequest.params.host === 'string') &&
diff --git a/modules/adkernelBidAdapter.js b/modules/adkernelBidAdapter.js
index 016cc5794fb..c3f34274692 100644
--- a/modules/adkernelBidAdapter.js
+++ b/modules/adkernelBidAdapter.js
@@ -16,7 +16,7 @@ export const spec = {
 
   code: 'adkernel',
   aliases: ['headbidding'],
-  supportedMediaTypes: [VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO],
   isBidRequestValid: function(bidRequest) {
     return 'params' in bidRequest && typeof bidRequest.params.host !== 'undefined' &&
       'zoneId' in bidRequest.params && !isNaN(Number(bidRequest.params.zoneId));
diff --git a/modules/adxcgBidAdapter.js b/modules/adxcgBidAdapter.js
index 44b1f381bbe..91bf0746afc 100644
--- a/modules/adxcgBidAdapter.js
+++ b/modules/adxcgBidAdapter.js
@@ -1,7 +1,7 @@
 import * as utils from 'src/utils';
 import * as url from 'src/url';
 import {registerBidder} from 'src/adapters/bidderFactory';
-import {NATIVE, VIDEO} from 'src/mediaTypes';
+import {BANNER, NATIVE, VIDEO} from 'src/mediaTypes';
 
 /**
  * Adapter for requesting bids from adxcg.net
@@ -9,7 +9,7 @@ import {NATIVE, VIDEO} from 'src/mediaTypes';
  */
 
 const BIDDER_CODE = 'adxcg';
-const SUPPORTED_AD_TYPES = [VIDEO, NATIVE];
+const SUPPORTED_AD_TYPES = [BANNER, VIDEO, NATIVE];
 const SOURCE = 'pbjs10';
 export const spec = {
   code: BIDDER_CODE,
diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 21af777bdc5..6e5d4820ee1 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -1,13 +1,12 @@
 import { Renderer } from 'src/Renderer';
 import * as utils from 'src/utils';
 import { registerBidder } from 'src/adapters/bidderFactory';
-import { NATIVE, VIDEO } from 'src/mediaTypes';
+import { BANNER, NATIVE, VIDEO } from 'src/mediaTypes';
 import find from 'core-js/library/fn/array/find';
 import includes from 'core-js/library/fn/array/includes';
 
 const BIDDER_CODE = 'appnexus';
 const URL = '//ib.adnxs.com/ut/v3/prebid';
-const SUPPORTED_AD_TYPES = ['banner', 'video', 'native'];
 const VIDEO_TARGETING = ['id', 'mimes', 'minduration', 'maxduration',
   'startdelay', 'skippable', 'playback_method', 'frameworks'];
 const USER_PARAMS = ['age', 'external_uid', 'segments', 'gender', 'dnt', 'language'];
@@ -31,7 +30,7 @@ const SOURCE = 'pbjs';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['appnexusAst', 'brealtime', 'pagescience', 'defymedia', 'gourmetads', 'matomy', 'featureforward', 'oftmedia', 'districtm'],
-  supportedMediaTypes: [VIDEO, NATIVE],
+  supportedMediaTypes: [BANNER, VIDEO, NATIVE],
 
   /**
    * Determines whether or not the given bid request is valid.
@@ -103,7 +102,7 @@ export const spec = {
       serverResponse.tags.forEach(serverBid => {
         const rtbBid = getRtbBid(serverBid);
         if (rtbBid) {
-          if (rtbBid.cpm !== 0 && includes(SUPPORTED_AD_TYPES, rtbBid.ad_type)) {
+          if (rtbBid.cpm !== 0 && includes(this.supportedMediaTypes, rtbBid.ad_type)) {
             const bid = newBid(serverBid, rtbBid);
             bid.mediaType = parseMediaType(rtbBid);
             bids.push(bid);
@@ -197,7 +196,6 @@ function newBid(serverBid, rtbBid) {
       width: rtbBid.rtb.video.player_width,
       height: rtbBid.rtb.video.player_height,
       vastUrl: rtbBid.rtb.video.asset_url,
-      descriptionUrl: rtbBid.rtb.video.asset_url,
       ttl: 3600
     });
     // This supports Outstream Video
@@ -209,9 +207,9 @@ function newBid(serverBid, rtbBid) {
       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'] = {
+  } else if (rtbBid.rtb[NATIVE]) {
+    const nativeAd = rtbBid.rtb[NATIVE];
+    bid[NATIVE] = {
       title: nativeAd.title,
       body: nativeAd.desc,
       cta: nativeAd.ctatext,
@@ -256,6 +254,7 @@ 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);
@@ -294,19 +293,24 @@ function bidToTag(bid) {
     tag.keywords = getKeywords(bid.params.keywords);
   }
 
-  if (bid.mediaType === 'native' || utils.deepAccess(bid, 'mediaTypes.native')) {
-    tag.ad_types = ['native'];
+  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]};
+      tag[NATIVE] = {layouts: [nativeRequest]};
     }
   }
 
-  const videoMediaType = utils.deepAccess(bid, 'mediaTypes.video');
+  const videoMediaType = utils.deepAccess(bid, `mediaTypes.${VIDEO}`);
   const context = utils.deepAccess(bid, 'mediaTypes.video.context');
 
-  if (bid.mediaType === 'video' || (videoMediaType && context !== 'outstream')) {
+  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;
   }
 
@@ -318,6 +322,13 @@ function bidToTag(bid) {
       .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;
 }
 
@@ -414,12 +425,12 @@ function handleOutstreamRendererEvents(bid, id, eventName) {
 
 function parseMediaType(rtbBid) {
   const adType = rtbBid.ad_type;
-  if (adType === 'video') {
-    return 'video';
-  } else if (adType === 'native') {
-    return 'native';
+  if (adType === VIDEO) {
+    return VIDEO;
+  } else if (adType === NATIVE) {
+    return NATIVE;
   } else {
-    return 'banner';
+    return BANNER;
   }
 }
 
diff --git a/modules/audienceNetworkBidAdapter.js b/modules/audienceNetworkBidAdapter.js
index 41ca539ccba..2b0e4cd8190 100644
--- a/modules/audienceNetworkBidAdapter.js
+++ b/modules/audienceNetworkBidAdapter.js
@@ -12,7 +12,7 @@ const code = 'audienceNetwork';
 const currency = 'USD';
 const method = 'GET';
 const url = 'https://an.facebook.com/v2/placementbid.json';
-const supportedMediaTypes = ['video'];
+const supportedMediaTypes = ['banner', 'video'];
 const netRevenue = true;
 const hb_bidder = 'fan';
 
diff --git a/modules/colossussspBidAdapter.js b/modules/colossussspBidAdapter.js
new file mode 100644
index 00000000000..df011bc102d
--- /dev/null
+++ b/modules/colossussspBidAdapter.js
@@ -0,0 +1,132 @@
+import { registerBidder } from 'src/adapters/bidderFactory';
+import * as utils from 'src/utils';
+
+const BIDDER_CODE = 'colossusssp';
+const URL = '//colossusssp.com/?c=o&m=multi';
+const URL_SYNC = '//colossusssp.com/?c=o&m=cookie';
+
+let sizeObj = {
+  '468x60': 1,
+  '728x90': 2,
+  '300x600': 10,
+  '300x250': 15,
+  '300x100': 19,
+  '320x50': 43,
+  '300x50': 44,
+  '300x300': 48,
+  '300x1050': 54,
+  '970x90': 55,
+  '970x250': 57,
+  '1000x90': 58,
+  '320x80': 59,
+  '640x480': 65,
+  '320x480': 67,
+  '320x320': 72,
+  '320x160': 73,
+  '480x300': 83,
+  '970x310': 94,
+  '970x210': 96,
+  '480x320': 101,
+  '768x1024': 102,
+  '1000x300': 113,
+  '320x100': 117,
+  '800x250': 118,
+  '200x600': 119
+};
+
+utils._each(sizeObj, (item, key) => sizeObj[item] = key);
+
+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: (bid) => {
+    return (!isNaN(bid.params.placement_id) &&
+    ((bid.params.sizes !== undefined && bid.params.sizes.length > 0 && bid.params.sizes.some((sizeIndex) => sizeObj[sizeIndex] !== undefined)) ||
+    (bid.sizes !== undefined && bid.sizes.length > 0 && bid.sizes.map((size) => `${size[0]}x${size[1]}`).some((size) => sizeObj[size] !== undefined))));
+  },
+
+  /**
+   * 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) => {
+    let winTop = window;
+    try {
+      window.top.location.toString();
+      winTop = window.top;
+    } catch (e) {
+      utils.logMessage(e);
+    };
+    let location = utils.getTopWindowLocation();
+    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
+    };
+    for (let i = 0; i < validBidRequests.length; i++) {
+      let bid = validBidRequests[i];
+      let placement = {};
+      placement['placementId'] = bid.params.placement_id;
+      placement['bidId'] = bid.bidId;
+      placement['sizes'] = bid.sizes;
+      placements.push(placement);
+    }
+    return {
+      method: 'POST',
+      url: 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 (resItem.width && !isNaN(resItem.width) &&
+            resItem.height && !isNaN(resItem.height) &&
+            resItem.requestId && typeof resItem.requestId === 'string' &&
+            resItem.cpm && !isNaN(resItem.cpm) &&
+            resItem.ad && typeof resItem.ad === 'string' &&
+            resItem.ttl && !isNaN(resItem.ttl) &&
+            resItem.creativeId && typeof resItem.creativeId === 'string' &&
+            resItem.netRevenue && typeof resItem.netRevenue === 'boolean' &&
+            resItem.currency && typeof resItem.currency === 'string') {
+          response.push(resItem);
+        }
+      }
+    } catch (e) {
+      utils.logMessage(e);
+    };
+    return response;
+  },
+
+  getUserSyncs: () => {
+    return [{
+      type: 'image',
+      url: URL_SYNC
+    }];
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/colossussspBidAdapter.md b/modules/colossussspBidAdapter.md
new file mode 100644
index 00000000000..9a5b9a0fe39
--- /dev/null
+++ b/modules/colossussspBidAdapter.md
@@ -0,0 +1,26 @@
+# Overview
+
+```
+Module Name: Colossus SSP Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: support@colossusmediallc.com
+```
+
+# Description
+
+Module that connects to Colossus SSP demand sources
+
+# Test Parameters
+```
+    var adUnits = [{
+                code: 'placementid_0',
+                sizes: [[300, 250]],
+                bids: [{
+                        bidder: 'colossusssp',
+                        params: {
+                            placement_id: 0
+                        }
+                    }]
+                }
+            ];
+```
diff --git a/modules/conversantBidAdapter.js b/modules/conversantBidAdapter.js
index 1f6c4f27b77..cae64983089 100644
--- a/modules/conversantBidAdapter.js
+++ b/modules/conversantBidAdapter.js
@@ -1,6 +1,6 @@
 import * as utils from 'src/utils';
 import {registerBidder} from 'src/adapters/bidderFactory';
-import { VIDEO } from 'src/mediaTypes';
+import { BANNER, VIDEO } from 'src/mediaTypes';
 
 const BIDDER_CODE = 'conversant';
 const URL = '//media.msg.dotomi.com/s2s/header/24';
@@ -10,7 +10,7 @@ const VERSION = '2.2.1';
 export const spec = {
   code: BIDDER_CODE,
   aliases: ['cnvr'], // short code
-  supportedMediaTypes: [VIDEO],
+  supportedMediaTypes: [BANNER, VIDEO],
 
   /**
    * Determines whether or not the given bid request is valid.
diff --git a/modules/freewheelSSPBidAdapter.js b/modules/freewheelSSPBidAdapter.js
index 64ebb36478b..632df8fe93c 100644
--- a/modules/freewheelSSPBidAdapter.js
+++ b/modules/freewheelSSPBidAdapter.js
@@ -190,7 +190,7 @@ var getOutstreamScript = function(bid) {
 
 export const spec = {
   code: BIDDER_CODE,
-  supportedMediaTypes: ['video'],
+  supportedMediaTypes: ['banner', 'video'],
   aliases: ['stickyadstv'], //  former name for freewheel-ssp
   /**
   * Determines whether or not the given bid request is valid.
diff --git a/modules/inskinBidAdapter.js b/modules/inskinBidAdapter.js
new file mode 100644
index 00000000000..5274b5b2ba8
--- /dev/null
+++ b/modules/inskinBidAdapter.js
@@ -0,0 +1,210 @@
+import * as utils from 'src/utils';
+import { registerBidder } from 'src/adapters/bidderFactory';
+
+const BIDDER_CODE = 'inskin';
+
+const CONFIG = {
+  'inskin': {
+    'BASE_URI': 'https://mfad.inskinad.com/api/v2'
+  }
+};
+
+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) {
+    return !!(bid.params.networkId && bid.params.siteId);
+  },
+
+  /**
+   * 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) {
+    // Do we need to group by bidder? i.e. to make multiple requests for
+    // different endpoints.
+
+    let ret = {
+      method: 'POST',
+      url: '',
+      data: '',
+      bidRequest: []
+    };
+
+    if (validBidRequests.length < 1) {
+      return ret;
+    }
+
+    let ENDPOINT_URL;
+
+    const data = Object.assign({
+      placements: [],
+      time: Date.now(),
+      user: {},
+      url: utils.getTopWindowUrl(),
+      referrer: document.referrer,
+      enableBotFiltering: true,
+      includePricingData: true,
+      parallel: true
+    }, validBidRequests[0].params);
+
+    validBidRequests.map(bid => {
+      let config = CONFIG[bid.bidder];
+      ENDPOINT_URL = config.BASE_URI;
+
+      const placement = Object.assign({
+        divName: bid.bidId,
+        adTypes: bid.adTypes || getSize(bid.sizes),
+        eventIds: [40, 201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 261, 262, 263, 264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284, 285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295]
+      }, bid.params);
+
+      placement.adTypes.push(5, 9, 163, 2163, 3006);
+
+      if (placement.networkId && placement.siteId) {
+        data.placements.push(placement);
+      }
+    });
+
+    ret.data = JSON.stringify(data);
+    ret.bidRequest = validBidRequests;
+    ret.url = ENDPOINT_URL;
+
+    return ret;
+  },
+
+  /**
+   * 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) {
+    let bid;
+    let bids;
+    let bidId;
+    let bidObj;
+    let bidResponses = [];
+    let bidsMap = {};
+
+    bids = bidRequest.bidRequest;
+
+    serverResponse = (serverResponse || {}).body;
+    for (let i = 0; i < bids.length; i++) {
+      bid = {};
+      bidObj = bids[i];
+      bidId = bidObj.bidId;
+
+      bidsMap[bidId] = bidObj;
+
+      if (serverResponse) {
+        const decision = serverResponse.decisions && serverResponse.decisions[bidId];
+        const price = decision && decision.pricing && decision.pricing.clearPrice;
+
+        if (decision && price) {
+          bid.requestId = bidId;
+          bid.cpm = price;
+          bid.width = decision.width;
+          bid.height = decision.height;
+          bid.ad = retrieveAd(bidId, decision);
+          bid.currency = 'USD';
+          bid.creativeId = decision.adId;
+          bid.ttl = 360;
+          bid.netRevenue = true;
+          bid.referrer = utils.getTopWindowUrl();
+
+          bidResponses.push(bid);
+        }
+      }
+    }
+
+    if (bidResponses.length) {
+      window.addEventListener('message', function(e) {
+        if (!e.data || e.data.from !== 'ism-bid') {
+          return;
+        }
+
+        const decision = serverResponse.decisions && serverResponse.decisions[e.data.bidId];
+        if (!decision) {
+          return;
+        }
+
+        const id = 'ism_tag_' + Math.floor((Math.random() * 10e16));
+        window[id] = {
+          bidId: e.data.bidId,
+          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);
+      });
+    }
+
+    return bidResponses;
+  },
+
+  getUserSyncs: function(syncOptions) {
+    return [];
+  }
+};
+
+const sizeMap = [
+  null,
+  '120x90',
+  '120x90',
+  '468x60',
+  '728x90',
+  '300x250',
+  '160x600',
+  '120x600',
+  '300x100',
+  '180x150',
+  '336x280',
+  '240x400',
+  '234x60',
+  '88x31',
+  '120x60',
+  '120x240',
+  '125x125',
+  '220x250',
+  '250x250',
+  '250x90',
+  '0x0',
+  '200x90',
+  '300x50',
+  '320x50',
+  '320x480',
+  '185x185',
+  '620x45',
+  '300x125',
+  '800x250'
+];
+
+sizeMap[77] = '970x90';
+sizeMap[123] = '970x250';
+sizeMap[43] = '300x600';
+
+function getSize(sizes) {
+  const result = [];
+  sizes.forEach(function(size) {
+    const index = sizeMap.indexOf(size[0] + 'x' + size[1]);
+    if (index >= 0) {
+      result.push(index);
+    }
+  });
+  return result;
+}
+
+function retrieveAd(bidId, decision) {
+  return "<script>window.top.postMessage({from: 'ism-bid', bidId: '" + bidId + "'}, '*');\x3c/script>" + utils.createTrackPixelHtml(decision.impressionUrl);
+}
+
+registerBidder(spec);
diff --git a/modules/inskinBidAdapter.md b/modules/inskinBidAdapter.md
new file mode 100644
index 00000000000..2284124dc98
--- /dev/null
+++ b/modules/inskinBidAdapter.md
@@ -0,0 +1,30 @@
+# Overview
+
+Module Name: InSkin Bid Adapter
+
+Module Type: Bid Adapter
+
+Maintainer: jgrimes@adzerk.com
+
+# Description
+
+Connects to InSkin Media for receiving bids from configured demand sources.
+
+# Test Parameters
+```javascript
+    var adUnits = [
+        {
+            code: 'test-ad-1',
+            sizes: [[300, 250]],
+            bids: [
+                {
+                    bidder: 'inskin',
+                    params: {
+                        networkId: '9874',
+                        siteId: '983808'
+                    }
+                }
+            ]
+        }
+    ];
+```
diff --git a/modules/optimeraBidAdapter.js b/modules/optimeraBidAdapter.js
new file mode 100644
index 00000000000..fc3c4c96f1b
--- /dev/null
+++ b/modules/optimeraBidAdapter.js
@@ -0,0 +1,84 @@
+import {registerBidder} from 'src/adapters/bidderFactory';
+const BIDDER_CODE = 'optimera';
+const SCORES_BASE_URL = 'https://s3.amazonaws.com/elasticbeanstalk-us-east-1-397719490216/json/client/';
+
+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 (bidRequest) {
+    if (typeof bidRequest.params !== 'undefined' && typeof bidRequest.params.clientID !== 'undefined') {
+      return true;
+    } else {
+      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: function (validBidRequests) {
+    let optimeraHost = window.location.host;
+    let optimeraPathName = window.location.pathname;
+    let timestamp = Math.round(new Date().getTime() / 1000);
+    if (typeof validBidRequests[0].params.clientID !== 'undefined') {
+      let clientID = validBidRequests[0].params.clientID;
+      let scoresURL = SCORES_BASE_URL + clientID + '/' + optimeraHost + optimeraPathName + '.js';
+      return {
+        method: 'GET',
+        url: scoresURL,
+        payload: validBidRequests,
+        data: {'t': timestamp}
+      };
+    }
+  },
+  /**
+   * 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) {
+    let validBids = bidRequest.payload;
+    let bidResponses = [];
+    let dealId = '';
+    if (typeof serverResponse.body !== 'undefined') {
+      let scores = serverResponse.body;
+      for (let i = 0; i < validBids.length; i++) {
+        if (typeof validBids[i].params.clientID !== 'undefined') {
+          if (validBids[i].adUnitCode in scores) {
+            dealId = scores[validBids[i].adUnitCode];
+          }
+          let bidResponse = {
+            requestId: validBids[i].bidId,
+            ad: '<div></div>',
+            cpm: 0.01,
+            width: 0,
+            height: 0,
+            dealId: 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
new file mode 100644
index 00000000000..8fca42fdac0
--- /dev/null
+++ b/modules/optimeraBidAdapter.md
@@ -0,0 +1,36 @@
+# 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: '0'
+                        }
+                    }]
+            },{
+                code: 'div-0',
+                sizes: [[728, 90]],
+                bids: [
+                    {
+                        bidder: 'optimera',
+                        params: {
+                              clientID: '0'
+                        }
+                    }]
+            }];
+```
diff --git a/modules/pre1api.js b/modules/pre1api.js
new file mode 100644
index 00000000000..707d10fbfd8
--- /dev/null
+++ b/modules/pre1api.js
@@ -0,0 +1,156 @@
+
+/**
+ pre1api module
+
+ This module supports backwards compatibility for those who need extra time to re-code their pages to work with the
+ Prebid 1.0 API. Use of this backwards compatibility module is recommended only as an interim solution.
+
+ It provides equivalents for the following variables and functions that were deprecated in PBJS 1.0:
+ - pbjs._winningBids
+ - pbjs._bidsReceived
+ - pbjs._bidsRequested
+ - pbjs._adUnitCodes
+ - pbjs._adsReceived
+ - pbjs.cbTimeout
+ - pbjs.addCallback()
+ - pbjs.removeCallback()
+ - pbjs.allBidsAvailable()
+ - pbjs.bidderTimeout
+ - pbjs.logging
+ - pbjs.publisherDomain
+ - pbjs.setPriceGranularity()
+ - pbjs.enableSendAllBids() // and also defaults this value to `false` like pre-1.0
+ - pbjs.setBidderSequence()
+ - pbjs.setS2SConfig() // and makes endpoints optional again (defaulting to the appnexus endpoints)
+
+ This will not support the pre-1.0 sizeMapping feature.
+
+ The drawback is that this module disables concurrency for requestBids(), queueing them as was done in pre-1.0. Anytime
+ an auction request is queued or one of these APIs is accessed it will display a deprecation warning in the console if
+ logging is enabled. So while this is useful for those that need more time to migrate, it eliminates one of the best
+ features of PBJS 1.0 as is required to emulate the old API.
+ */
+
+import {config} from 'src/config';
+import {logWarn, logInfo} from 'src/utils';
+
+const MODULE_NAME = 'pre-1.0 API';
+
+let pbjs = window['$$PREBID_GLOBAL$$'];
+
+logInfo(`loading ${MODULE_NAME} module and patching prebid with deprecated APIs.`);
+
+let auctionQueue = [];
+
+let emptyFn = () => [];
+
+Object.defineProperty(pbjs, '_winningBids', {
+  get: () => pbjs.getAllWinningBids()
+});
+
+let auctionPropMap = {
+  _bidsReceived: auction => auction.getBidsReceived(),
+  _bidsRequested: auction => auction.getBidRequests(),
+  _adUnitCodes: auction => auction.getAdUnitCodes(),
+  allBidsAvailable: auction => auction.getBidRequests().every((bidRequest) => bidRequest.doneCbCallCount >= 1)
+};
+
+let configPropMap = {
+  cbTimeout: 'bidderTimeout',
+  bidderTimeout: 'bidderTimeout',
+  logging: 'debug',
+  publisherDomain: 'publisherDomain',
+  enableSendAllBids: 'enableSendAllBids',
+  setPriceGranularity: 'priceGranularity',
+  setBidderSequence: 'bidderSequence',
+  setS2SConfig: 's2sConfig'
+};
+
+pbjs.addCallback = pbjs.onEvent;
+pbjs.removeCallback = pbjs.offEvent;
+
+// can't see anywhere that this was used, but it is listed in Prebid 1.0 transition guide...
+// so just adding as empty array
+pbjs._adsReceived = [];
+
+config.setDefaults({
+  enableSendAllBids: false,
+  cache: {
+    url: 'https://prebid.adnxs.com/pbc/v1/cache'
+  }
+});
+
+let currAuction = {
+  getBidsReceived: emptyFn,
+  getBidsRequested: emptyFn,
+  getAdUnitCodes: emptyFn,
+  getTimeout: () => config.getConfig('bidderTimeout')
+};
+
+// we need to intercept s2sConfig rather than call setConfig or setDefaults directly, otherwise the code will fail when
+// the server adapter attempts to validate the configuration passed in by the publisher
+config.setConfig.addHook((config, next) => {
+  if (config.s2sConfig) {
+    config.s2sConfig = Object.assign({
+      endpoint: 'https://prebid.adnxs.com/pbs/v1/auction',
+      syncEndpoint: 'https://prebid.adnxs.com/pbs/v1/cookie_sync'
+    }, config.s2sConfig);
+  }
+  next(config);
+});
+
+/**
+ * Hook to queue and disallow concurrent auctions (as Prebid would function pre 1.0)
+ */
+pbjs.requestBids.addHook((config, next = config) => {
+  auctionQueue.push(() => {
+    let oldHandler = config.bidsBackHandler;
+    config.bidsBackHandler = (...args) => {
+      if (typeof oldHandler === 'function') {
+        oldHandler.apply(null, args);
+      }
+
+      auctionQueue.shift();
+      if (auctionQueue[0]) {
+        auctionQueue[0]();
+      }
+    };
+
+    currAuction = next(config);
+  });
+
+  if (auctionQueue.length === 1) {
+    auctionQueue[0]();
+  } else {
+    logWarn(`${MODULE_NAME} module: concurrency has been disabled and "$$PREBID_GLOBAL$$.requestBids" call was queued`);
+  }
+}, 100);
+
+Object.keys(auctionPropMap).forEach(prop => {
+  if (prop === 'allBidsAvailable') {
+    pbjs[prop] = deprecated(prop, () => auctionPropMap[prop](currAuction));
+  }
+  Object.defineProperty(pbjs, prop, {
+    get: deprecated(prop, () => auctionPropMap[prop](currAuction))
+  });
+});
+
+Object.keys(configPropMap).forEach(prop => {
+  if (prop === 'enableSendAllBids') {
+    pbjs[prop] = deprecated(prop, () => config.setConfig({[prop]: true}));
+  } else if (prop.lastIndexOf('set', 0) === 0) {
+    pbjs[prop] = deprecated(prop, value => config.setConfig({[configPropMap[prop]]: value}));
+  } else {
+    Object.defineProperty(pbjs, prop, {
+      get: deprecated(prop, () => config.getConfig(configPropMap[prop])),
+      set: deprecated(prop, value => config.setConfig({[configPropMap[prop]]: value}))
+    });
+  }
+});
+
+function deprecated(name, fn) {
+  return (...args) => {
+    logWarn(`${MODULE_NAME} module: accessed deprecated API "$$PREBID_GLOBAL$$.${name}"`);
+    return fn.apply(null, args);
+  };
+}
diff --git a/modules/pubmaticBidAdapter.js b/modules/pubmaticBidAdapter.js
new file mode 100644
index 00000000000..dfcde047580
--- /dev/null
+++ b/modules/pubmaticBidAdapter.js
@@ -0,0 +1,291 @@
+import * as utils from 'src/utils';
+import { registerBidder } from 'src/adapters/bidderFactory';
+const constants = require('src/constants.json');
+
+const BIDDER_CODE = 'pubmatic';
+const ENDPOINT = '//hbopenbid.pubmatic.com/translator?source=prebid-client';
+const USYNCURL = '//ads.pubmatic.com/AdServer/js/showad.js#PIX&kdntuid=1&p=';
+const CURRENCY = 'USD';
+const AUCTION_TYPE = 1;
+const UNDEFINED = undefined;
+const CUSTOM_PARAMS = {
+  'kadpageurl': '', // Custom page url
+  'gender': '', // User gender
+  'yob': '', // User year of birth
+  'lat': '', // User location - Latitude
+  'lon': '', // User Location - Longitude
+  'wiid': '', // OpenWrap Wrapper Impression ID
+  'profId': '', // OpenWrap Legacy: Profile ID
+  'verId': '' // OpenWrap Legacy: version ID
+};
+const NET_REVENUE = false;
+
+let publisherId = 0;
+
+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('PubMatic: Ignoring param key: ' + paramName + ', expects string-value, found ' + typeof paramValue);
+    return UNDEFINED;
+  }
+
+  switch (paramName) {
+    case 'pmzoneid':
+      return paramValue.split(',').slice(0, 50).map(id => id.trim()).join();
+    case 'kadfloor':
+      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 _cleanSlot(slotName) {
+  if (utils.isStr(slotName)) {
+    return slotName.replace(/^\s+/g, '').replace(/\s+$/g, '');
+  }
+  return '';
+}
+
+function _parseAdSlot(bid) {
+  bid.params.adUnit = '';
+  bid.params.adUnitIndex = '0';
+  bid.params.width = 0;
+  bid.params.height = 0;
+
+  bid.params.adSlot = _cleanSlot(bid.params.adSlot);
+
+  var slot = bid.params.adSlot;
+  var splits = slot.split(':');
+
+  slot = splits[0];
+  if (splits.length == 2) {
+    bid.params.adUnitIndex = splits[1];
+  }
+  splits = slot.split('@');
+  if (splits.length != 2) {
+    utils.logWarn('AdSlot Error: adSlot not in required format');
+    return;
+  }
+  bid.params.adUnit = splits[0];
+  splits = splits[1].split('x');
+  if (splits.length != 2) {
+    utils.logWarn('AdSlot Error: adSlot not in required format');
+    return;
+  }
+  bid.params.width = parseInt(splits[0]);
+  bid.params.height = parseInt(splits[1]);
+}
+
+function _initConf() {
+  var conf = {};
+  conf.pageURL = utils.getTopWindowUrl();
+  conf.refURL = utils.getTopWindowReferrer();
+  return conf;
+}
+
+function _handleCustomParams(params, conf) {
+  if (!conf.kadpageurl) {
+    conf.kadpageurl = conf.pageURL;
+  }
+
+  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 (utils.isStr(value)) {
+          conf[key] = value;
+        } else {
+          utils.logWarn('PubMatic: 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: [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: {}
+  };
+}
+
+function _createImpressionObject(bid, conf) {
+  return {
+    id: bid.bidId,
+    tagid: bid.params.adUnit,
+    bidfloor: _parseSlotParam('kadfloor', bid.params.kadfloor),
+    secure: window.location.protocol === 'https:' ? 1 : 0,
+    banner: {
+      pos: 0,
+      w: bid.params.width,
+      h: bid.params.height,
+      topframe: utils.inIframe() ? 0 : 1,
+    },
+    ext: {
+      pmZoneId: _parseSlotParam('pmzoneid', bid.params.pmzoneid)
+    }
+  };
+}
+
+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 => {
+    if (bid && bid.params) {
+      if (!utils.isStr(bid.params.publisherId)) {
+        utils.logWarn('PubMatic Error: publisherId is mandatory and cannot be numeric. Call to OpenBid will not be sent.');
+        return false;
+      }
+      if (!utils.isStr(bid.params.adSlot)) {
+        utils.logWarn('PubMatic: adSlotId is mandatory and cannot be numeric. Call to OpenBid will not be sent.');
+        return false;
+      }
+      return true;
+    }
+    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: validBidRequests => {
+    var conf = _initConf();
+    var payload = _createOrtbTemplate(conf);
+    validBidRequests.forEach(bid => {
+      _parseAdSlot(bid);
+      if (!(bid.params.adSlot && bid.params.adUnit && bid.params.adUnitIndex && bid.params.width && bid.params.height)) {
+        utils.logWarn('PubMatic: Skipping the non-standard adslot:', bid.params.adSlot, bid);
+        return;
+      }
+      conf.pubId = conf.pubId || bid.params.publisherId;
+      conf = _handleCustomParams(bid.params, conf);
+      conf.transactionId = bid.transactionId;
+      payload.imp.push(_createImpressionObject(bid, conf));
+    });
+
+    if (payload.imp.length == 0) {
+      return;
+    }
+
+    payload.site.publisher.id = conf.pubId.trim();
+    publisherId = conf.pubId.trim();
+    payload.ext.wrapper = {};
+    payload.ext.wrapper.profile = conf.profId || UNDEFINED;
+    payload.ext.wrapper.version = conf.verId || UNDEFINED;
+    payload.ext.wrapper.wiid = conf.wiid || UNDEFINED;
+    payload.ext.wrapper.wv = constants.REPO_AND_VERSION;
+    payload.ext.wrapper.transactionId = conf.transactionId;
+    payload.ext.wrapper.wp = 'pbjs';
+    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.device.geo.lat = _parseSlotParam('lat', conf.lat);
+    payload.device.geo.lon = _parseSlotParam('lon', conf.lon);
+    payload.site.page = conf.kadpageurl.trim() || payload.site.page.trim();
+    payload.site.domain = _getDomainFromURL(payload.site.page);
+    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.seatbid && response.body.seatbid[0] && response.body.seatbid[0].bid) {
+        response.body.seatbid[0].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: CURRENCY,
+            netRevenue: NET_REVENUE,
+            ttl: 300,
+            referrer: utils.getTopWindowUrl(),
+            ad: bid.adm
+          };
+          bidResponses.push(newBid);
+        });
+      }
+    } catch (error) {
+      utils.logError(error);
+    }
+    return bidResponses;
+  },
+
+  /**
+  * Register User Sync.
+  */
+  getUserSyncs: syncOptions => {
+    if (syncOptions.iframeEnabled) {
+      return [{
+        type: 'iframe',
+        url: USYNCURL + publisherId
+      }];
+    } else {
+      utils.logWarn('PubMatic: Please enable iframe based user sync.');
+    }
+  }
+};
+
+registerBidder(spec);
diff --git a/modules/pubmaticBidAdapter.md b/modules/pubmaticBidAdapter.md
new file mode 100644
index 00000000000..768b3c541f6
--- /dev/null
+++ b/modules/pubmaticBidAdapter.md
@@ -0,0 +1,53 @@
+# Overview
+
+```
+Module Name:  PubMatic Bid Adapter
+Module Type:  Bidder Adapter
+Maintainer: header-bidding@pubmatic.com
+```
+
+# Description
+
+Connects to PubMatic exchange for bids.
+
+PubMatic bid adapter supports Banner currently.
+
+# Sample Ad Unit: For Publishers
+```
+var adUnits = [
+{
+    code: 'test-div',    
+    sizes: [
+        [300, 250],
+        [728, 90]
+    ],     
+    bids: [{
+      bidder: 'pubmatic',
+      params: {
+        publisherId: '156209',               // required
+        adSlot: 'pubmatic_test2@300x250',    // required
+        pmzoneid: 'zone1, zone11',           // optional
+        lat: '40.712775',                    // optional
+        lon: '-74.005973',                   // optional
+        yob: '1982',                         // optional
+        kadpageurl: 'www.test.com',          // optional							
+        gender: 'M',                         // optional
+        kadfloor: '0.50'                     // optional 									
+      }
+    }]
+}
+```
+
+### Configuration
+
+PubMatic recommends the UserSync configuration below.  Without it, the PubMatic adapter will not able to perform user syncs, which lowers match rate and reduces monetization.
+
+```javascript
+pbjs.setConfig({
+   userSync: {
+    iframeEnabled: true,
+    enabledBidders: ['pubmatic'],
+    syncDelay: 6000
+ }});
+```
+Note: Combine the above the configuration with any other UserSync configuration.  Multiple setConfig() calls overwrite each other and only last call for a given attribute will take effect.
diff --git a/modules/pulsepointBidAdapter.js b/modules/pulsepointBidAdapter.js
index 2c1f6f9174d..fc637cc9fff 100644
--- a/modules/pulsepointBidAdapter.js
+++ b/modules/pulsepointBidAdapter.js
@@ -28,7 +28,7 @@ export const spec = {
 
   aliases: ['pulseLite', 'pulsepointLite'],
 
-  supportedMediaTypes: ['native'],
+  supportedMediaTypes: ['banner', 'native'],
 
   isBidRequestValid: bid => (
     !!(bid && bid.params && bid.params.cp && bid.params.ct)
diff --git a/modules/rockyouBidAdapter.js b/modules/rockyouBidAdapter.js
new file mode 100644
index 00000000000..975756d18bc
--- /dev/null
+++ b/modules/rockyouBidAdapter.js
@@ -0,0 +1,363 @@
+import * as utils from 'src/utils';
+import { Renderer } from 'src/Renderer';
+import { BANNER, VIDEO } from 'src/mediaTypes';
+import { registerBidder } from 'src/adapters/bidderFactory';
+
+const BIDDER_CODE = 'rockyou';
+
+const BASE_REQUEST_PATH = 'https://tas.rockyou.net/servlet/rotator/';
+const IFRAME_SYNC_URL = 'https://prebid.tex-sync.rockyou.net/usersync2/tas';
+const VAST_PLAYER_LOCATION = 'https://rya-static.rockyou.com/rya/js/PreBidPlayer.js';
+export const ROTATION_ZONE = 'openrtbprod';
+
+let isBidRequestValid = (bid) => {
+  return !!bid.params && !!bid.params.placementId;
+};
+
+/**
+* The RockYou Ad Serving system currently only accepts one placementId
+* per Ad request. For this reason, the first placementId indicated
+* will be chosen as the predominant placementId for this request.
+*/
+let determineOptimalPlacementId = (bidRequest) => {
+  return bidRequest.params.placementId;
+}
+
+let determineOptimalRequestId = (bidRequest) => {
+  return bidRequest.bidId;
+}
+
+let buildSiteComponent = (bidRequest) => {
+  let topLocation = utils.getTopWindowLocation();
+
+  let site = {
+    domain: topLocation.hostname,
+    page: topLocation.href,
+    ref: topLocation.origin
+  };
+
+  return site;
+}
+
+let buildDeviceComponent = (bidRequest) => {
+  let device = {
+    js: 1,
+    language: ('language' in navigator) ? navigator.language : null
+  };
+
+  return device;
+};
+
+let extractValidSize = (bidRequest) => {
+  let width = null;
+  let height = null;
+
+  if (!utils.isEmpty(bidRequest.sizes)) {
+    // Ensure the size array is normalized
+    let conformingSize = utils.parseSizesInput(bidRequest.sizes);
+
+    if (!utils.isEmpty(conformingSize) && conformingSize[0] != null) {
+      // Currently only the first size is utilized
+      let splitSizes = conformingSize[0].split('x');
+
+      width = parseInt(splitSizes[0]);
+      height = parseInt(splitSizes[1]);
+    }
+  }
+
+  return {
+    w: width,
+    h: height
+  };
+};
+
+let generateVideoComponent = (bidRequest) => {
+  let impSize = extractValidSize(bidRequest);
+
+  return {
+    w: impSize.w,
+    h: impSize.h
+  }
+}
+
+let generateBannerComponent = (bidRequest) => {
+  let impSize = extractValidSize(bidRequest);
+
+  return {
+    w: impSize.w,
+    h: impSize.h
+  }
+}
+
+let generateImpBody = (bidRequest) => {
+  let mediaTypes = bidRequest.mediaTypes;
+
+  let banner = null;
+  let video = null;
+
+  // Assume banner if the mediatype is not included
+  if (mediaTypes && mediaTypes.video) {
+    video = generateVideoComponent(bidRequest);
+  } else {
+    banner = generateBannerComponent(bidRequest);
+  }
+
+  return {
+    id: bidRequest.index,
+    banner: banner,
+    video: video
+  };
+}
+
+let generatePayload = (bidRequests) => {
+  // Generate the expected OpenRTB payload
+
+  let rootBidRequest = bidRequests[0];
+
+  let index = 1;
+  bidRequests.forEach((bidRequest) => {
+    bidRequest.index = index;
+    index += 1;
+  })
+
+  let payload = {
+    id: determineOptimalRequestId(rootBidRequest),
+    site: buildSiteComponent(rootBidRequest),
+    device: buildDeviceComponent(rootBidRequest),
+    imp: bidRequests.map(generateImpBody)
+  };
+
+  return JSON.stringify(payload);
+};
+
+let overridableProperties = (request) => {
+  let rendererLocation = VAST_PLAYER_LOCATION;
+  let baseRequestPath = BASE_REQUEST_PATH;
+  let rotationZone = ROTATION_ZONE;
+
+  if (!utils.isEmpty(request.rendererOverride)) {
+    rendererLocation = request.rendererOverride;
+  }
+
+  if (request.params) {
+    if (!utils.isEmpty(request.params.baseRequestPath)) {
+      baseRequestPath = request.params.baseRequestPath;
+    }
+
+    if (!utils.isEmpty(request.params.rotationZone)) {
+      rotationZone = request.params.rotationZone;
+    }
+  }
+
+  return {
+    rendererLocation,
+    baseRequestPath,
+    rotationZone
+  }
+}
+
+let buildRequests = (validBidRequests, requestRoot) => {
+  const requestType = 'POST';
+
+  let requestUrl = null;
+  let requestPayload = null;
+  let mediaTypes = null;
+  let adUnitCode = null;
+  let rendererOverride = null;
+
+  // Due to the nature of how URLs are generated, there must
+  // be at least one bid request present for this to function
+  // correctly
+  if (!utils.isEmpty(validBidRequests)) {
+    let headBidRequest = validBidRequests[0];
+
+    let serverLocations = overridableProperties(headBidRequest);
+
+    // requestUrl is the full endpoint w/ relevant adspot paramters
+    let placementId = determineOptimalPlacementId(headBidRequest);
+    requestUrl = `${serverLocations.baseRequestPath}${placementId}/0/vo?z=${serverLocations.rotationZone}`;
+
+    // requestPayload is the POST body JSON for the OpenRtb request
+    requestPayload = generatePayload(validBidRequests);
+
+    mediaTypes = headBidRequest.mediaTypes;
+    adUnitCode = headBidRequest.adUnitCode;
+    rendererOverride = headBidRequest.rendererOverride;
+  }
+  const result = {
+    method: requestType,
+    type: requestType,
+    url: requestUrl,
+    data: requestPayload,
+    mediaTypes,
+    requestId: requestRoot.bidderRequestId,
+    adUnitCode,
+    rendererOverride
+  };
+
+  return result;
+};
+
+let outstreamRender = (bid) => {
+  // push to render queue because player may not be loaded yet
+  bid.renderer.push(() => {
+    let adUnitCode = bid.renderer.config.adUnitCode;
+
+    try {
+      RockYouVastPlayer.render(adUnitCode, bid, playerCallbacks(bid.renderer));
+    } catch (pbe) {
+      utils.logError(pbe);
+    }
+  });
+}
+
+let rockYouEventTranslation = (rockYouEvent) => {
+  let translated;
+  switch (rockYouEvent) {
+    case 'LOAD':
+      translated = 'loaded';
+      break;
+    case 'IMPRESSION':
+      translated = 'impression';
+      break;
+    case 'COMPLETE':
+    case 'ERROR':
+      translated = 'ended'
+      break;
+  }
+
+  return translated;
+}
+
+let playerCallbacks = (renderer) => (id, eventName) => {
+  eventName = rockYouEventTranslation(eventName);
+
+  if (eventName) {
+    renderer.handleVideoEvent({ id, eventName });
+  }
+};
+
+let generateRenderer = (bid, adUnitCode, rendererLocation) => {
+  let renderer = Renderer.install({
+    url: rendererLocation,
+    config: {
+      adText: `RockYou Outstream Video Ad`,
+      adUnitCode: adUnitCode
+    },
+    id: bid.id
+  });
+
+  bid.renderer = renderer;
+
+  try {
+    renderer.setRender(outstreamRender);
+  } catch (err) {
+    utils.logWarn('Prebid Error calling setRender on renderer', err);
+  }
+
+  renderer.setEventHandlers({
+    impression: () => utils.logMessage('RockYou outstream video impression event'),
+    loaded: () => utils.logMessage('RockYou outstream video loaded event'),
+    ended: () => {
+      utils.logMessage('RockYou outstream renderer video event');
+      document.querySelector(`#${adUnitCode}`).style.display = 'none';
+    }
+  });
+
+  return renderer;
+};
+
+let interpretResponse = (serverResponse, request) => {
+  let responses = [];
+
+  if (serverResponse.body) {
+    let responseBody = serverResponse.body;
+
+    if (responseBody != null) {
+      let seatBids = responseBody.seatbid;
+
+      if (!(utils.isEmpty(seatBids) ||
+            utils.isEmpty(seatBids[0].bid))) {
+        let bid = seatBids[0].bid[0];
+
+        // handle any values that may end up undefined
+        let nullify = (value) => typeof value === 'undefined' ? null : value;
+
+        let ttl = null;
+        if (bid.ext) {
+          ttl = nullify(bid.ext.ttl);
+        }
+
+        let bidWidth = nullify(bid.w);
+        let bidHeight = nullify(bid.h);
+
+        let bannerCreative = null;
+        let videoXml = null;
+        let mediaType = null;
+        let renderer = null;
+
+        if (request.mediaTypes && request.mediaTypes.video) {
+          videoXml = bid.adm;
+          mediaType = VIDEO;
+
+          let serversideLocations = overridableProperties(request);
+
+          renderer = generateRenderer(bid, request.adUnitCode, serversideLocations.rendererLocation);
+        } else {
+          bannerCreative = bid.adm;
+        }
+
+        let response = {
+          requestId: responseBody.id,
+          cpm: bid.price,
+          width: bidWidth,
+          height: bidHeight,
+          ad: bannerCreative,
+          ttl: ttl,
+          creativeId: bid.adid,
+          netRevenue: true,
+          currency: responseBody.cur,
+          vastUrl: null,
+          vastXml: videoXml,
+          dealId: null,
+          mediaType: mediaType,
+          renderer: renderer
+        };
+
+        responses.push(response);
+      }
+    }
+  }
+
+  return responses;
+};
+
+let getUserSyncs = (syncOptions, serverResponses) => {
+  const syncs = []
+
+  if (syncOptions.iframeEnabled) {
+    syncs.push({
+      type: 'iframe',
+      url: IFRAME_SYNC_URL
+    });
+  }
+
+  return syncs;
+}
+
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['ry'],
+  isBidRequestValid: isBidRequestValid,
+  buildRequests: buildRequests,
+  interpretResponse: interpretResponse,
+  getUserSyncs: getUserSyncs,
+  supportedMediaTypes: [BANNER, VIDEO]
+};
+
+export const internals = {
+  playerCallbacks,
+  generateRenderer
+}
+
+registerBidder(spec);
diff --git a/modules/rockyouBidAdapter.md b/modules/rockyouBidAdapter.md
new file mode 100644
index 00000000000..8cc9ba371d7
--- /dev/null
+++ b/modules/rockyouBidAdapter.md
@@ -0,0 +1,57 @@
+# 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',
+    sizes: [[720, 480]],
+
+    // Replace this object to test a new Adapter!
+    bids: [{
+          bidder: 'rockyou',
+          params: {
+            placementId: '4322'
+          }
+        }]
+  },
+
+  // Video (outstream)
+  {
+    code: 'video-outstream',
+    sizes: [[720, 480]],
+
+    mediaType: 'video',
+    mediaTypes: {
+      video: {
+        context: 'outstream'
+      }
+    },
+    bids: [{
+      bidder: 'rockyou',
+      params: {
+        placementId: '4307'
+      }
+    }]
+  }
+]
+```
diff --git a/modules/rubiconBidAdapter.js b/modules/rubiconBidAdapter.js
index 76a9095be72..1e7762ae90d 100644
--- a/modules/rubiconBidAdapter.js
+++ b/modules/rubiconBidAdapter.js
@@ -73,7 +73,7 @@ utils._each(sizeMap, (item, key) => sizeMap[item] = key);
 export const spec = {
   code: 'rubicon',
   aliases: ['rubiconLite'],
-  supportedMediaTypes: ['video'],
+  supportedMediaTypes: ['banner', 'video'],
   /**
    * @param {object} bid
    * @return boolean
diff --git a/modules/sekindoUMBidAdapter.js b/modules/sekindoUMBidAdapter.js
index 6e4ae34bd76..09b94be967b 100644
--- a/modules/sekindoUMBidAdapter.js
+++ b/modules/sekindoUMBidAdapter.js
@@ -2,7 +2,7 @@ import * as utils from 'src/utils';
 import {registerBidder} from 'src/adapters/bidderFactory';
 export const spec = {
   code: 'sekindoUM',
-  supportedMediaTypes: ['video'],
+  supportedMediaTypes: ['banner', 'video'],
   /**
    * Determines whether or not the given bid request is valid.
    *
diff --git a/modules/smartadserverBidAdapter.js b/modules/smartadserverBidAdapter.js
new file mode 100644
index 00000000000..4828f3a36a8
--- /dev/null
+++ b/modules/smartadserverBidAdapter.js
@@ -0,0 +1,92 @@
+import * as utils from 'src/utils';
+import {
+  config
+} from 'src/config';
+import {
+  registerBidder
+} from 'src/adapters/bidderFactory';
+const BIDDER_CODE = 'smartadserver';
+export const spec = {
+  code: BIDDER_CODE,
+  aliases: ['smart'], // 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 && bid.params.siteId && bid.params.pageId && bid.params.formatId && bid.params.domain);
+  },
+  /**
+   * 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) {
+    // 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
+    var bid = validBidRequests[0];
+    const payload = {
+      siteid: bid.params.siteId,
+      pageid: bid.params.pageId,
+      formatid: bid.params.formatId,
+      currencyCode: config.getConfig('currency.adServerCurrency'),
+      bidfloor: bid.params.bidfloor || 0.0,
+      targeting: bid.params.target && bid.params.target != '' ? bid.params.target : undefined,
+      tagId: bid.adUnitCode,
+      sizes: bid.sizes.map(size => ({
+        w: size[0],
+        h: size[1]
+      })),
+      pageDomain: utils.getTopWindowUrl(),
+      transactionId: bid.transactionId,
+      timeout: config.getConfig('bidderTimeout'),
+      bidId: bid.bidId
+    };
+    const payloadString = JSON.stringify(payload);
+    return {
+      method: 'POST',
+      url: bid.params.domain + '/prebid/v1',
+      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, bidRequest) {
+    const bidResponses = [];
+    var response = serverResponse.body;
+    try {
+      if (response) {
+        const bidResponse = {
+          requestId: JSON.parse(bidRequest.data).bidId,
+          cpm: response.cpm,
+          width: response.width,
+          height: response.height,
+          creativeId: response.creativeId,
+          dealId: response.dealId,
+          currency: response.currency,
+          netRevenue: response.isNetCpm,
+          ttl: response.ttl,
+          referrer: utils.getTopWindowUrl(),
+          adUrl: response.adUrl,
+          ad: response.ad
+        };
+        bidResponses.push(bidResponse);
+      }
+    } catch (error) {
+      console.log('Error while parsing smart server response');
+    }
+    return bidResponses;
+  }
+}
+registerBidder(spec);
diff --git a/modules/smartadserverBidAdapter.md b/modules/smartadserverBidAdapter.md
new file mode 100644
index 00000000000..f904aa40b3a
--- /dev/null
+++ b/modules/smartadserverBidAdapter.md
@@ -0,0 +1,35 @@
+# Overview
+
+```
+Module Name: Smart Ad Server Bidder Adapter
+Module Type: Bidder Adapter
+Maintainer: gcarnec@smartadserver.com
+```
+
+# Description
+
+Connect to Smart for bids.
+
+The Smart adapter requires setup and approval from the Smart team.
+Please reach out to your Technical account manager for more information.
+
+# Test Parameters
+```
+    var adUnits = [
+           {
+               code: 'test-div',
+               sizes: [[300, 250]],  // a display size
+               bids: [
+                   {
+                       bidder: "smart",
+                       params: {
+                            domain: 'http://prg.smartadserver.com',
+                            siteId: 207435,
+                            pageId: 896536,
+                            formatId: 62913
+                       }
+                   }
+               ]
+           }
+       ];
+```
\ No newline at end of file
diff --git a/package.json b/package.json
index b4ffaecda35..fdd66001fed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
diff --git a/src/adaptermanager.js b/src/adaptermanager.js
index 5577ffc6fca..b4a874a0736 100644
--- a/src/adaptermanager.js
+++ b/src/adaptermanager.js
@@ -234,7 +234,7 @@ exports.checkBidRequestSizes = (adUnits) => {
     if (mediaTypes && mediaTypes.video) {
       const video = mediaTypes.video;
       if (video.playerSize) {
-        if (Array.isArray(video.playerSize) && video.playerSize.length === 2 && Number.isInteger(video.playerSize[0]) && Number.isInteger(video.playerSize[1])) {
+        if (Array.isArray(video.playerSize) && video.playerSize.length === 2 && utils.isInteger(video.playerSize[0]) && utils.isInteger(video.playerSize[1])) {
           adUnit.sizes = video.playerSize;
         } 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.');
diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
index ed3cc28db32..10315241c40 100644
--- a/src/adapters/bidderFactory.js
+++ b/src/adapters/bidderFactory.js
@@ -172,8 +172,14 @@ export function newBidder(spec) {
       // After all the responses have come back, call done() and
       // register any required usersync pixels.
       const responses = [];
-      function afterAllResponses() {
-        done();
+      function afterAllResponses(bids) {
+        const videoBid = bids && bids[0] && bids[0].mediaType && bids[0].mediaType === 'video';
+        const cacheEnabled = config.getConfig('cache.url');
+
+        // video bids with cache enabled need to be cached first before they are considered done
+        if (!(videoBid && cacheEnabled)) {
+          done();
+        }
         registerSyncs(responses);
       }
 
@@ -281,7 +287,7 @@ export function newBidder(spec) {
               addBidUsingRequestMap(bids);
             }
           }
-          onResponse();
+          onResponse(bids);
 
           function addBidUsingRequestMap(bid) {
             const bidRequest = bidRequestMap[bid.requestId];
diff --git a/src/auction.js b/src/auction.js
index 2a4cc128c2a..7a6b44ca459 100644
--- a/src/auction.js
+++ b/src/auction.js
@@ -56,7 +56,6 @@ import { Renderer } from 'src/Renderer';
 import { config } from 'src/config';
 import { userSync } from 'src/userSync';
 import { createHook } from 'src/hook';
-import { videoAdUnit } from 'src/video';
 import find from 'core-js/library/fn/array/find';
 import includes from 'core-js/library/fn/array/includes';
 
@@ -153,20 +152,9 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels})
         return innerBidRequestId === bidRequest.bidderRequestId;
       });
 
-      const nonVideoBid = request.bids.filter(videoAdUnit).length === 0;
-      const videoBid = request.bids.filter(videoAdUnit).length > 0;
-      const videoBidNoCache = videoBid && !config.getConfig('cache.url');
-      const videoBidWithCache = videoBid && config.getConfig('cache.url');
-
-      // video bids with cache enabled need to be cached first before saying they are done
-      if (!videoBidWithCache) {
-        request.doneCbCallCount += 1;
-      }
-
-      // in case of mediaType video and prebidCache enabled, call bidsBackHandler after cache is stored.
-      if (nonVideoBid || videoBidNoCache) {
-        bidsBackAll()
-      }
+      // this is done for cache-enabled video bids in tryAddVideoBids, after the cache is stored
+      request.doneCbCallCount += 1;
+      bidsBackAll();
     }, 1);
   }
 
@@ -379,7 +367,13 @@ export function getStandardBidderSettings() {
         val: function (bidResponse) {
           return bidResponse.source;
         }
-      }
+      },
+      {
+        key: 'hb_format',
+        val: function (bidResponse) {
+          return bidResponse.mediaType;
+        }
+      },
     ]
   }
   return bidder_settings[CONSTANTS.JSON_MAPPING.BD_SETTING_STANDARD];
diff --git a/src/config.js b/src/config.js
index 146c0f17a65..ff68fc7bfff 100644
--- a/src/config.js
+++ b/src/config.js
@@ -10,6 +10,7 @@
 import { isValidPriceConfig } from './cpmBucketManager';
 import find from 'core-js/library/fn/array/find';
 import includes from 'core-js/library/fn/array/includes';
+import { createHook } from 'src/hook';
 const utils = require('./utils');
 
 const DEFAULT_DEBUG = false;
@@ -188,7 +189,7 @@ export function newConfig() {
    * Sets configuration given an object containing key-value pairs and calls
    * listeners that were added by the `subscribe` function
    */
-  function setConfig(options) {
+  let setConfig = createHook('asyncSeries', function setConfig(options) {
     if (typeof options !== 'object') {
       utils.logError('setConfig options must be an object');
       return;
@@ -208,7 +209,7 @@ export function newConfig() {
     });
 
     callSubscribers(topicalConfig);
-  }
+  });
 
   /**
    * Sets configuration defaults which setConfig values can be applied on top of
diff --git a/src/constants.json b/src/constants.json
index e80c118ea83..9a2639ab83f 100644
--- a/src/constants.json
+++ b/src/constants.json
@@ -52,7 +52,8 @@
     "hb_pb",
     "hb_size",
     "hb_deal",
-    "hb_source"
+    "hb_source",
+    "hb_format"
   ],
   "S2S" : {
     "SRC" : "s2s",
diff --git a/src/prebid.js b/src/prebid.js
index de74f2c4d7b..86fd678ee7e 100644
--- a/src/prebid.js
+++ b/src/prebid.js
@@ -2,14 +2,13 @@
 
 import { getGlobal } from './prebidGlobal';
 import { flatten, uniques, isGptPubadsDefined, adUnitsFilter, removeRequestId } from './utils';
-import { videoAdUnit, videoBidder, hasNonVideoBidder } from './video';
-import { nativeAdUnit, nativeBidder, hasNonNativeBidder } from './native';
 import { listenMessagesFromCreative } from './secureCreatives';
 import { userSync } from 'src/userSync.js';
 import { loadScript } from './adloader';
 import { config } from './config';
 import { auctionManager } from './auctionManager';
 import { targeting } from './targeting';
+import { createHook } from 'src/hook';
 import includes from 'core-js/library/fn/array/includes';
 
 var $$PREBID_GLOBAL$$ = getGlobal();
@@ -283,7 +282,7 @@ $$PREBID_GLOBAL$$.removeAdUnit = function (adUnitCode) {
  * @param {Array} requestOptions.labels
  * @alias module:pbjs.requestBids
  */
-$$PREBID_GLOBAL$$.requestBids = function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels } = {}) {
+$$PREBID_GLOBAL$$.requestBids = createHook('asyncSeries', function ({ bidsBackHandler, timeout, adUnits, adUnitCodes, labels } = {}) {
   events.emit('requestBids');
   const cbTimeout = timeout || config.getConfig('bidderTimeout');
   adUnits = adUnits || $$PREBID_GLOBAL$$.adUnits;
@@ -298,24 +297,34 @@ $$PREBID_GLOBAL$$.requestBids = function ({ bidsBackHandler, timeout, adUnits, a
     adUnitCodes = adUnits && adUnits.map(unit => unit.code);
   }
 
-  // for video-enabled adUnits, only request bids for bidders that support video
-  adUnits.filter(videoAdUnit).filter(hasNonVideoBidder).forEach(adUnit => {
-    const nonVideoBidders = adUnit.bids
-      .filter(bid => !videoBidder(bid))
-      .map(bid => bid.bidder);
-
-    utils.logWarn(utils.unsupportedBidderMessage(adUnit, nonVideoBidders));
-    adUnit.bids = adUnit.bids.filter(videoBidder);
-  });
-
-  // for native-enabled adUnits, only request bids for bidders that support native
-  adUnits.filter(nativeAdUnit).filter(hasNonNativeBidder).forEach(adUnit => {
-    const nonNativeBidders = adUnit.bids
-      .filter(bid => !nativeBidder(bid))
-      .map(bid => bid.bidder);
-
-    utils.logWarn(utils.unsupportedBidderMessage(adUnit, nonNativeBidders));
-    adUnit.bids = adUnit.bids.filter(nativeBidder);
+  /*
+   * for a given adunit which supports a set of mediaTypes
+   * and a given bidder which supports a set of mediaTypes
+   * a bidder is eligible to participate on the adunit
+   * if it supports at least one of the mediaTypes on the adunit
+   */
+  adUnits.forEach(adUnit => {
+    // get the adunit's mediaTypes, defaulting to banner if mediaTypes isn't present
+    const adUnitMediaTypes = Object.keys(adUnit.mediaTypes || {'banner': 'banner'});
+
+    // get the bidder's mediaTypes
+    const bidders = adUnit.bids.map(bid => bid.bidder);
+    const bidderRegistry = adaptermanager.bidderRegistry;
+
+    bidders.forEach(bidder => {
+      const adapter = bidderRegistry[bidder];
+      const spec = adapter && adapter.getSpec && adapter.getSpec()
+      // banner is default if not specified in spec
+      const bidderMediaTypes = (spec && spec.supportedMediaTypes) || ['banner'];
+
+      // check if the bidder's mediaTypes are not in the adUnit's mediaTypes
+      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));
+        adUnit.bids = adUnit.bids.filter(bid => bid.bidder !== bidder);
+      }
+    });
   });
 
   if (!adUnits || adUnits.length === 0) {
@@ -333,7 +342,8 @@ $$PREBID_GLOBAL$$.requestBids = function ({ bidsBackHandler, timeout, adUnits, a
 
   const auction = auctionManager.createAuction({adUnits, adUnitCodes, callback: bidsBackHandler, cbTimeout, labels});
   auction.callBids();
-};
+  return auction;
+});
 
 /**
  *
diff --git a/src/utils.js b/src/utils.js
index 2d185ebe4c6..0957b4e6c8f 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -832,17 +832,16 @@ export function isSlotMatchingAdUnitCode(adUnitCode) {
 /**
  * Constructs warning message for when unsupported bidders are dropped from an adunit
  * @param {Object} adUnit ad unit from which the bidder is being dropped
- * @param {Array} unSupportedBidders arrary of bidder codes that are not compatible with the adUnit
+ * @param {string} bidder bidder code that is not compatible with the adUnit
  * @return {string} warning message to display when condition is met
  */
-export function unsupportedBidderMessage(adUnit, unSupportedBidders) {
-  const mediaType = adUnit.mediaType || Object.keys(adUnit.mediaTypes).join(', ');
-  const plural = unSupportedBidders.length === 1 ? 'This bidder' : 'These bidders';
+export function unsupportedBidderMessage(adUnit, bidder) {
+  const mediaType = Object.keys(adUnit.mediaTypes || {'banner': 'banner'}).join(', ');
 
   return `
     ${adUnit.code} is a ${mediaType} ad unit
-    containing bidders that don't support ${mediaType}: ${unSupportedBidders.join(', ')}.
-    ${plural} won't fetch demand.
+    containing bidders that don't support ${mediaType}: ${bidder}.
+    This bidder won't fetch demand.
   `;
 }
 
diff --git a/test/spec/auctionmanager_spec.js b/test/spec/auctionmanager_spec.js
index 3429087a24f..a1248030c51 100644
--- a/test/spec/auctionmanager_spec.js
+++ b/test/spec/auctionmanager_spec.js
@@ -37,6 +37,7 @@ describe('auctionmanager.js', function () {
     var size = '300x250';
     var adId = '1adId';
     var source = 'client';
+    var mediatype = 'banner';
 
     before(function () {
       bid.cpm = bidPriceCpm;
@@ -54,6 +55,7 @@ describe('auctionmanager.js', function () {
       bid.bidderCode = bidderCode;
       bid.adId = adId;
       bid.source = source;
+      bid.mediaType = mediatype;
     });
 
     it('No bidder level configuration defined - default', function () {
@@ -62,7 +64,8 @@ describe('auctionmanager.js', function () {
         'hb_adid': adId,
         'hb_pb': bidPbMg,
         'hb_size': size,
-        'hb_source': source
+        'hb_source': source,
+        'hb_format': mediatype,
       };
       var response = getKeyValueTargetingPairs(bidderCode, bid, CONSTANTS.GRANULARITY_OPTIONS.MEDIUM);
       assert.deepEqual(response, expected);
@@ -100,7 +103,13 @@ describe('auctionmanager.js', function () {
               val: function (bidResponse) {
                 return bidResponse.source;
               }
-            }
+            },
+            {
+              key: 'hb_format',
+              val: function (bidResponse) {
+                return bidResponse.mediaType;
+              }
+            },
           ]
 
         }
@@ -111,7 +120,8 @@ describe('auctionmanager.js', function () {
         'hb_adid': adId,
         'hb_pb': bidPbHg,
         'hb_size': size,
-        'hb_source': source
+        'hb_source': source,
+        'hb_format': mediatype,
       };
       var response = getKeyValueTargetingPairs(bidderCode, bid, CONSTANTS.GRANULARITY_OPTIONS.MEDIUM);
       assert.deepEqual(response, expected);
@@ -154,7 +164,8 @@ describe('auctionmanager.js', function () {
         'hb_adid': adId,
         'hb_pb': bidPbHg,
         'hb_size': size,
-        'hb_source': source
+        'hb_source': source,
+        'hb_format': mediatype,
       };
       var response = getKeyValueTargetingPairs(bidderCode, bid);
       assert.deepEqual(response, expected);
@@ -197,7 +208,8 @@ describe('auctionmanager.js', function () {
         'hb_adid': adId,
         'hb_pb': bidPbMg,
         'hb_size': size,
-        'hb_source': source
+        'hb_source': source,
+        'hb_format': mediatype,
       };
       var response = getKeyValueTargetingPairs(bidderCode, bid, CONSTANTS.GRANULARITY_OPTIONS.MEDIUM);
       assert.deepEqual(response, expected);
@@ -362,7 +374,8 @@ describe('auctionmanager.js', function () {
         'hb_adid': adId,
         'hb_pb': 5.57,
         'hb_size': '300x250',
-        'hb_source': source
+        'hb_source': source,
+        'hb_format': mediatype,
       };
       var response = getKeyValueTargetingPairs(bidderCode, bid);
       assert.deepEqual(response, expected);
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index c95fe18c688..6b09690d17a 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -76,6 +76,30 @@ describe('AppNexusAdapter', () => {
       });
     });
 
+    it('should populate the ad_types array on all requests', () => {
+      ['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', () => {
+      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', () => {
       const request = spec.buildRequests(bidRequests);
       expect(request.url).to.equal(ENDPOINT);
@@ -364,7 +388,6 @@ describe('AppNexusAdapter', () => {
 
       let result = spec.interpretResponse({ body: response }, {bidderRequest});
       expect(result[0]).to.have.property('vastUrl');
-      expect(result[0]).to.have.property('descriptionUrl');
       expect(result[0]).to.have.property('mediaType', 'video');
     });
 
diff --git a/test/spec/modules/audienceNetworkBidAdapter_spec.js b/test/spec/modules/audienceNetworkBidAdapter_spec.js
index b153a58eeb0..cabcdce46f2 100644
--- a/test/spec/modules/audienceNetworkBidAdapter_spec.js
+++ b/test/spec/modules/audienceNetworkBidAdapter_spec.js
@@ -25,7 +25,7 @@ describe('AudienceNetwork adapter', () => {
       expect(code).to.equal(bidder);
     });
     it('supportedMediaTypes', () => {
-      expect(supportedMediaTypes).to.deep.equal(['video']);
+      expect(supportedMediaTypes).to.deep.equal(['banner', 'video']);
     });
     it('isBidRequestValid', () => {
       expect(isBidRequestValid).to.be.a('function');
diff --git a/test/spec/modules/colossussspBidAdapter_spec.js b/test/spec/modules/colossussspBidAdapter_spec.js
new file mode 100644
index 00000000000..e14d2f27b42
--- /dev/null
+++ b/test/spec/modules/colossussspBidAdapter_spec.js
@@ -0,0 +1,119 @@
+import {expect} from 'chai';
+import {spec} from '../../../modules/colossussspBidAdapter';
+
+describe('ColossussspAdapter', () => {
+  let bid = {
+    bidId: '2dd581a2b6281d',
+    bidder: 'colossusssp',
+    bidderRequestId: '145e1d6a7837c9',
+    params: {
+      placement_id: 0
+    },
+    placementCode: 'placementid_0',
+    auctionId: '74f78609-a92d-4cf1-869f-1b244bbfb5d2',
+    sizes: [[300, 250]],
+    transactionId: '3bb2f6da-87a6-4029-aeb0-bfe951372e62'
+  };
+
+  describe('isBidRequestValid', () => {
+    it('Should return true when placement_id can be cast to a number, and when at least one of the sizes passed is allowed', () => {
+      expect(spec.isBidRequestValid(bid)).to.be.true;
+    });
+    it('Should return false when placement_id is not a number', () => {
+      bid.params.placement_id = 'aaa';
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+    it('Should return false when the sizes are not allowed', () => {
+      bid.sizes = [[1, 1]];
+      expect(spec.isBidRequestValid(bid)).to.be.false;
+    });
+  });
+
+  describe('buildRequests', () => {
+    let serverRequest = spec.buildRequests([bid]);
+    it('Creates a ServerRequest object with method, URL and data', () => {
+      expect(serverRequest).to.exist;
+      expect(serverRequest.method).to.exist;
+      expect(serverRequest.url).to.exist;
+      expect(serverRequest.data).to.exist;
+    });
+    it('Returns POST method', () => {
+      expect(serverRequest.method).to.equal('POST');
+    });
+    it('Returns valid URL', () => {
+      expect(serverRequest.url).to.equal('//colossusssp.com/?c=o&m=multi');
+    });
+    it('Returns valid data if array of bids is valid', () => {
+      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', 'sizes');
+        expect(placement.placementId).to.be.a('number');
+        expect(placement.bidId).to.be.a('string');
+        expect(placement.sizes).to.be.an('array');
+      }
+    });
+    it('Returns empty data if no valid requests are passed', () => {
+      serverRequest = spec.buildRequests([]);
+      let data = serverRequest.data;
+      expect(data.placements).to.be.an('array').that.is.empty;
+    });
+  });
+  describe('interpretResponse', () => {
+    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'
+      } ]
+    };
+    let serverResponses = spec.interpretResponse(resObject);
+    it('Returns an array of valid server responses if response object is valid', () => {
+      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');
+        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');
+      }
+      it('Returns an empty array if invalid response is passed', () => {
+        serverResponses = spec.interpretResponse('invalid_response');
+        expect(serverResponses).to.be.an('array').that.is.empty;
+      });
+    });
+  });
+
+  describe('getUserSyncs', () => {
+    let userSync = spec.getUserSyncs();
+    it('Returns valid URL and type', () => {
+      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('//colossusssp.com/?c=o&m=cookie');
+    });
+  });
+});
diff --git a/test/spec/modules/conversantBidAdapter_spec.js b/test/spec/modules/conversantBidAdapter_spec.js
index c99cad473a3..9f7cb3ff17d 100644
--- a/test/spec/modules/conversantBidAdapter_spec.js
+++ b/test/spec/modules/conversantBidAdapter_spec.js
@@ -116,8 +116,8 @@ describe('Conversant adapter tests', function() {
     expect(spec.code).to.equal('conversant');
     expect(spec.aliases).to.be.an('array').with.lengthOf(1);
     expect(spec.aliases[0]).to.equal('cnvr');
-    expect(spec.supportedMediaTypes).to.be.an('array').with.lengthOf(1);
-    expect(spec.supportedMediaTypes[0]).to.equal('video');
+    expect(spec.supportedMediaTypes).to.be.an('array').with.lengthOf(2);
+    expect(spec.supportedMediaTypes[1]).to.equal('video');
   });
 
   it('Verify user syncs', function() {
diff --git a/test/spec/modules/eplanningBidAdapter_spec.js b/test/spec/modules/eplanningBidAdapter_spec.js
index 2ec7f482edd..a2583d79dc2 100644
--- a/test/spec/modules/eplanningBidAdapter_spec.js
+++ b/test/spec/modules/eplanningBidAdapter_spec.js
@@ -182,9 +182,9 @@ describe('E-Planning Adapter', () => {
       expect(spec.isBidRequestValid(invalidBid)).to.equal(false);
     });
 
-    it('should return true when bid does not have ci parameter but is a test bid'), () => {
-      expect(spec.isBidRequestValid(testBid).to.equal(true));
-    }
+    it('should return true when bid does not have ci parameter but is a test bid', () => {
+      expect(spec.isBidRequestValid(testBid)).to.equal(true);
+    });
   });
 
   describe('buildRequests', () => {
diff --git a/test/spec/modules/inskinBidAdapter_spec.js b/test/spec/modules/inskinBidAdapter_spec.js
new file mode 100644
index 00000000000..ee5064dca5a
--- /dev/null
+++ b/test/spec/modules/inskinBidAdapter_spec.js
@@ -0,0 +1,253 @@
+import { expect } from 'chai';
+import { spec } from 'modules/inskinBidAdapter';
+
+var bidFactory = require('src/bidfactory.js');
+
+const ENDPOINT = 'https://mfad.inskinad.com/api/v2';
+
+const REQUEST = {
+  'bidderCode': 'inskin',
+  'requestId': 'a4713c32-3762-4798-b342-4ab810ca770d',
+  'bidderRequestId': '109f2a181342a9',
+  'bidRequest': [{
+    'bidder': 'inskin',
+    'params': {
+      'networkId': 9874,
+      'siteId': 730181
+    },
+    'placementCode': 'div-gpt-ad-1487778092495-0',
+    'sizes': [
+      [728, 90],
+      [970, 90]
+    ],
+    'bidId': '2b0f82502298c9',
+    'bidderRequestId': '109f2a181342a9',
+    'requestId': 'a4713c32-3762-4798-b342-4ab810ca770d'
+  },
+  {
+    'bidder': 'inskin',
+    'params': {
+      'networkId': 9874,
+      'siteId': 730181
+    },
+    'placementCode': 'div-gpt-ad-1487778092495-0',
+    'sizes': [
+      [728, 90],
+      [970, 90]
+    ],
+    'bidId': '123',
+    'bidderRequestId': '109f2a181342a9',
+    'requestId': 'a4713c32-3762-4798-b342-4ab810ca770d'
+  }],
+  'start': 1487883186070,
+  'auctionStart': 1487883186069,
+  'timeout': 3000
+};
+
+const RESPONSE = {
+  'headers': null,
+  'body': {
+    'user': { 'key': 'ue1-2d33e91b71e74929b4aeecc23f4376f1' },
+    'decisions': {
+      '2b0f82502298c9': {
+        'adId': 2364764,
+        'creativeId': 1950991,
+        'flightId': 2788300,
+        'campaignId': 542982,
+        'clickUrl': 'https://mfad.inskinad.com/r',
+        'impressionUrl': 'https://mfad.inskinad.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}
+      },
+      '123': {
+        'adId': 2364764,
+        'creativeId': 1950991,
+        'flightId': 2788300,
+        'campaignId': 542982,
+        'clickUrl': 'https://mfad.inskinad.com/r',
+        'impressionUrl': 'https://mfad.inskinad.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}
+      }
+    }
+  }
+};
+
+describe('InSkin BidAdapter', () => {
+  let bidRequests;
+  let adapter = spec;
+
+  beforeEach(() => {
+    bidRequests = [
+      {
+        bidder: 'inskin',
+        params: {
+          networkId: '9874',
+          siteId: 'xxxxx'
+        },
+        placementCode: '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'
+      }
+    ];
+  });
+
+  describe('bid request validation', () => {
+    it('should accept valid bid requests', () => {
+      let bid = {
+        bidder: 'inskin',
+        params: {
+          networkId: '9874',
+          siteId: 'xxxxx'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should accept valid bid requests with extra fields', () => {
+      let bid = {
+        bidder: 'inskin',
+        params: {
+          networkId: '9874',
+          siteId: 'xxxxx',
+          zoneId: 'xxxxx'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+
+    it('should reject bid requests without siteId', () => {
+      let bid = {
+        bidder: 'inskin',
+        params: {
+          networkId: '9874'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+
+    it('should reject bid requests without networkId', () => {
+      let bid = {
+        bidder: 'inskin',
+        params: {
+          siteId: '9874'
+        }
+      };
+      expect(spec.isBidRequestValid(bid)).to.equal(false);
+    });
+  });
+
+  describe('buildRequests validation', () => {
+    it('creates request data', () => {
+      let request = spec.buildRequests(bidRequests);
+
+      expect(request).to.exist.and.to.be.a('object');
+    });
+
+    it('request to inskin should contain a url', () => {
+      let request = spec.buildRequests(bidRequests);
+
+      expect(request.url).to.have.string('inskinad.com');
+    });
+
+    it('requires valid bids to make request', () => {
+      let request = spec.buildRequests([]);
+      expect(request.bidRequest).to.be.empty;
+    });
+
+    it('sends bid request to ENDPOINT via POST', () => {
+      let request = spec.buildRequests(bidRequests);
+
+      expect(request.method).to.have.string('POST');
+    });
+  });
+  describe('interpretResponse validation', () => {
+    it('response should have valid bidderCode', () => {
+      let bidRequest = spec.buildRequests(REQUEST.bidRequest);
+      let bid = bidFactory.createBid(1, bidRequest.bidRequest[0]);
+
+      expect(bid.bidderCode).to.equal('inskin');
+    });
+
+    it('response should include objects for all bids', () => {
+      let bids = spec.interpretResponse(RESPONSE, REQUEST);
+
+      expect(bids.length).to.equal(2);
+    });
+
+    it('registers bids', () => {
+      let bids = spec.interpretResponse(RESPONSE, REQUEST);
+      bids.forEach(b => {
+        expect(b).to.have.property('cpm');
+        expect(b.cpm).to.be.above(0);
+        expect(b).to.have.property('requestId');
+        expect(b).to.have.property('cpm');
+        expect(b).to.have.property('width');
+        expect(b).to.have.property('height');
+        expect(b).to.have.property('ad');
+        expect(b).to.have.property('currency', 'USD');
+        expect(b).to.have.property('creativeId');
+        expect(b).to.have.property('ttl', 360);
+        expect(b).to.have.property('netRevenue', true);
+        expect(b).to.have.property('referrer');
+      });
+    });
+
+    it('handles nobid responses', () => {
+      let EMPTY_RESP = Object.assign({}, RESPONSE, {'body': {'decisions': null}})
+      let bids = spec.interpretResponse(EMPTY_RESP, REQUEST);
+
+      expect(bids).to.be.empty;
+    });
+
+    it('handles no server response', () => {
+      let bids = spec.interpretResponse(null, REQUEST);
+
+      expect(bids).to.be.empty;
+    });
+  });
+  describe('getUserSyncs', () => {
+    let syncOptions = {'iframeEnabled': true};
+
+    it('handles empty sync options', () => {
+      let opts = spec.getUserSyncs({});
+
+      expect(opts).to.be.empty;
+    });
+
+    it('should always return empty array', () => {
+      let opts = spec.getUserSyncs(syncOptions);
+
+      expect(opts).to.be.empty;
+    });
+  });
+});
diff --git a/test/spec/modules/optimeraBidAdapter_spec.js b/test/spec/modules/optimeraBidAdapter_spec.js
new file mode 100644
index 00000000000..413a52d2d7f
--- /dev/null
+++ b/test/spec/modules/optimeraBidAdapter_spec.js
@@ -0,0 +1,76 @@
+import { expect } from 'chai';
+import { spec } from 'modules/optimeraBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+
+describe('OptimeraAdapter', () => {
+  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', () => {
+    let bid = {
+      'bidder': 'optimera',
+      'params': {
+        'clientID': '0'
+      },
+      'adUnitCode': 'div-0',
+      'sizes': [[300, 250], [300, 600]],
+      'bidId': '30b31c1838de1e',
+      'bidderRequestId': '22edbae2733bf6',
+      'auctionId': '1d1a030790a475',
+    };
+
+    it('should return true when required params found', () => {
+      expect(spec.isBidRequestValid(bid)).to.equal(true);
+    });
+  })
+
+  describe('buildRequests', () => {
+    let bid = [
+      {
+        'adUnitCode': 'div-0',
+        'auctionId': '1ab30503e03994',
+        'bidId': '313e0afede8cdb',
+        'bidder': 'optimera',
+        'bidderRequestId': '202be1ce3f6194',
+        'params': {
+          'clientID': '0'
+        }
+      }
+    ];
+    it('buildRequests fires', () => {
+      let request = spec.buildRequests(bid);
+      expect(request).to.exist;
+      expect(request.method).to.equal('GET');
+      expect(request.payload).to.exist;
+      expect(request.data.t).to.exist;
+    });
+  })
+
+  describe('interpretResponse', () => {
+    let serverResponse = {};
+    serverResponse.body = JSON.parse('{"div-0":["RB_K","728x90K"], "timestamp":["RB_K","1507565666"]}');
+    var bidRequest = {
+      'method': 'get',
+      'payload': [
+        {
+          'bidder': 'optimera',
+          'params': {
+            'clientID': '0'
+          },
+          'adUnitCode': 'div-0',
+          'bidId': '307440db8538ab'
+        }
+      ]
+    }
+    it('interpresResponse fires', () => {
+      let bidResponses = spec.interpretResponse(serverResponse, bidRequest);
+      expect(bidResponses[0].dealId[0]).to.equal('RB_K');
+      expect(bidResponses[0].dealId[1]).to.equal('728x90K');
+    });
+  });
+});
diff --git a/test/spec/modules/pubmaticBidAdapter_spec.js b/test/spec/modules/pubmaticBidAdapter_spec.js
new file mode 100644
index 00000000000..cbf17f9478a
--- /dev/null
+++ b/test/spec/modules/pubmaticBidAdapter_spec.js
@@ -0,0 +1,180 @@
+import {expect} from 'chai';
+import {spec} from 'modules/pubmaticBidAdapter';
+import * as utils from 'src/utils';
+const constants = require('src/constants.json');
+
+describe('PubMatic adapter', () => {
+  let bidRequests;
+  let bidResponses;
+
+  beforeEach(() => {
+    bidRequests = [
+      {
+        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'
+        },
+        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'
+      }
+    ];
+
+    bidResponses = {
+      'body': {
+        'id': '93D3BAD6-E2E2-49FB-9D89-920B1761C865',
+        'seatbid': [{
+          'bid': [{
+            'id': '74858439-49D7-4169-BA5D-44A046315B2F',
+            'impid': '22bddb28db77d',
+            'price': 1.3,
+            'adm': 'image3.pubmatic.com Layer based creative',
+            'h': 250,
+            'w': 300
+          }]
+        }]
+      }
+    };
+  });
+
+  describe('implementation', () => {
+  	describe('Bid validations', () => {
+  		it('valid bid case', () => {
+		  let validBid = {
+	        bidder: 'pubmatic',
+	        params: {
+	          publisherId: '301',
+	          adSlot: '/15671365/DMDemo@300x250:0'
+	        }
+	      },
+	      isValid = spec.isBidRequestValid(validBid);
+	      expect(isValid).to.equal(true);
+  		});
+
+      it('invalid bid case: publisherId not passed', () => {
+		    let validBid = {
+	        bidder: 'pubmatic',
+	        params: {
+	          adSlot: '/15671365/DMDemo@300x250:0'
+	        }
+	      },
+	      isValid = spec.isBidRequestValid(validBid);
+	      expect(isValid).to.equal(false);
+  		});
+
+      it('invalid bid case: publisherId is not string', () => {
+        let validBid = {
+            bidder: 'pubmatic',
+            params: {
+              publisherId: 301,
+              adSlot: '/15671365/DMDemo@300x250:0'
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+
+  		it('invalid bid case: adSlot not passed', () => {
+  		  let validBid = {
+	        bidder: 'pubmatic',
+	        params: {
+	          publisherId: '301'
+	        }
+	      },
+	      isValid = spec.isBidRequestValid(validBid);
+	      expect(isValid).to.equal(false);
+    	});
+
+      it('invalid bid case: adSlot is not string', () => {
+        let validBid = {
+            bidder: 'pubmatic',
+            params: {
+              publisherId: '301',
+              adSlot: 15671365
+            }
+          },
+          isValid = spec.isBidRequestValid(validBid);
+        expect(isValid).to.equal(false);
+      });
+    });
+
+  	describe('Request formation', () => {
+  		it('Endpoint checking', () => {
+  		  let request = spec.buildRequests(bidRequests);
+        expect(request.url).to.equal('//hbopenbid.pubmatic.com/translator?source=prebid-client');
+        expect(request.method).to.equal('POST');
+  		});
+
+  		it('Request params check', () => {
+  		  let request = spec.buildRequests(bidRequests);
+  		  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(constants.REPO_AND_VERSION); // Wrapper Version
+  		  expect(data.ext.wrapper.transactionId).to.equal(bidRequests[0].transactionId); // Prebid TransactionId
+  		  expect(data.ext.wrapper.wiid).to.equal(bidRequests[0].params.wiid); // OpenWrap: Wrapper Impression ID
+  		  expect(data.ext.wrapper.profile).to.equal(bidRequests[0].params.profId); // OpenWrap: Wrapper Profile ID
+  		  expect(data.ext.wrapper.version).to.equal(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('invalid adslot', () => {
+  		  bidRequests[0].params.adSlot = '/15671365/DMDemo';
+  		  let request = spec.buildRequests(bidRequests);
+  		  expect(request).to.equal(undefined);
+  		});
+  	});
+
+    describe('Response checking', () => {
+      it('should check for valid response values', () => {
+        let request = spec.buildRequests(bidRequests);
+        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].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);
+        expect(response[0].referrer).to.include(utils.getTopWindowUrl());
+        expect(response[0].ad).to.equal(bidResponses.body.seatbid[0].bid[0].adm);
+      });
+    });
+  });
+});
diff --git a/test/spec/modules/pulsepointBidAdapter_spec.js b/test/spec/modules/pulsepointBidAdapter_spec.js
index cb99f1b5d98..933b65c4574 100644
--- a/test/spec/modules/pulsepointBidAdapter_spec.js
+++ b/test/spec/modules/pulsepointBidAdapter_spec.js
@@ -228,8 +228,8 @@ describe('PulsePoint Adapter Tests', () => {
   });
 
   it('Verifies supported media types', () => {
-    expect(spec.supportedMediaTypes).to.have.lengthOf(1);
-    expect(spec.supportedMediaTypes[0]).to.equal('native');
+    expect(spec.supportedMediaTypes).to.have.lengthOf(2);
+    expect(spec.supportedMediaTypes[1]).to.equal('native');
   });
 
   it('Verifies if bid request valid', () => {
diff --git a/test/spec/modules/rockyouBidAdapter_spec.js b/test/spec/modules/rockyouBidAdapter_spec.js
new file mode 100644
index 00000000000..8b38a333bca
--- /dev/null
+++ b/test/spec/modules/rockyouBidAdapter_spec.js
@@ -0,0 +1,455 @@
+import { expect } from 'chai';
+import { spec, internals } from 'modules/rockyouBidAdapter';
+import { newBidder } from 'src/adapters/bidderFactory';
+
+describe('RockYouAdapter', () => {
+  const adapter = newBidder(spec);
+
+  describe('bid validator', () => {
+    it('rejects a bid that is missing the placementId', () => {
+      let testBid = {};
+      expect(spec.isBidRequestValid(testBid)).to.be.false;
+    });
+
+    it('accepts a bid with all the expected parameters', () => {
+      let testBid = {
+        params: {
+          placementId: 'f39ba81609'
+        }
+      };
+
+      expect(spec.isBidRequestValid(testBid)).to.be.true;
+    });
+  });
+
+  describe('request builder', () => {
+    // Taken from the docs, so used as much as is valid
+    const sampleBidRequest = {
+      'bidder': 'tests',
+      'bidId': '51ef8751f9aead',
+      'params': {
+        'cId': '59ac1da80784890004047d89',
+        'placementId': 'ZZZPLACEMENTZZZ'
+      },
+      'adUnitCode': 'div-gpt-ad-1460505748561-0',
+      'transactionId': 'd7b773de-ceaa-484d-89ca-d9f51b8d61ec',
+      'sizes': [[320, 50], [300, 250], [300, 600]],
+      'bidderRequestId': '418b37f85e772c',
+      'auctionId': '18fd8b8b0bd757'
+    };
+
+    it('successfully generates a URL', () => {
+      const placementId = 'ZZZPLACEMENTZZZ';
+
+      let bidRequests = [
+        {
+          'params': {
+            'placementId': placementId
+          }
+        }
+      ];
+
+      let result = spec.buildRequests(bidRequests, {
+        bidderRequestId: 'sample'
+      });
+
+      expect(result.url).to.not.be.undefined;
+      expect(result.url).to.not.be.null;
+
+      expect(result.url).to.include('/servlet/rotator/' + placementId + '/0/vo?z=')
+    });
+
+    it('uses the bidId id as the openRtb request ID', () => {
+      const bidId = '51ef8751f9aead';
+
+      let bidRequests = [
+        sampleBidRequest
+      ];
+
+      let result = spec.buildRequests(bidRequests, {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+      expect(payload.id).to.equal(bidId);
+    });
+
+    it('generates the device payload as expected', () => {
+      let bidRequests = [
+        sampleBidRequest
+      ];
+
+      let result = spec.buildRequests(bidRequests, {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+      let userData = payload.user;
+
+      expect(userData).to.not.be.null;
+    });
+
+    it('generates multiple imp bodies', () => {
+      let bidRequests = [
+        sampleBidRequest,
+        sampleBidRequest
+      ];
+
+      let result = spec.buildRequests(bidRequests, {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+      expect(payload.imp).to.not.be.null;
+      expect(payload.imp.length).to.equal(2);
+    });
+
+    it('generates a banner request as expected', () => {
+      // clone the sample for stability
+      let localBidRequest = JSON.parse(JSON.stringify(sampleBidRequest));
+
+      localBidRequest.mediaTypes = { banner: {} };
+
+      let result = spec.buildRequests([localBidRequest], {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+
+      let imps = payload.imp;
+
+      let firstImp = imps[0];
+
+      expect(firstImp.banner).to.not.be.null;
+
+      let bannerData = firstImp.banner;
+
+      expect(bannerData.w).to.equal(320);
+      expect(bannerData.h).to.equal(50);
+    });
+
+    it('generates a banner request using a singular adSize instead of an array', () => {
+      // clone the sample for stability
+      let localBidRequest = JSON.parse(JSON.stringify(sampleBidRequest));
+      localBidRequest.sizes = [320, 50];
+      localBidRequest.mediaTypes = { banner: {} };
+
+      let result = spec.buildRequests([localBidRequest], {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+
+      let imps = payload.imp;
+
+      let firstImp = imps[0];
+
+      expect(firstImp.banner).to.not.be.null;
+
+      let bannerData = firstImp.banner;
+
+      expect(bannerData.w).to.equal(320);
+      expect(bannerData.h).to.equal(50);
+    });
+
+    it('fails gracefully on an invalid size', () => {
+      // clone the sample for stability
+      let localBidRequest = JSON.parse(JSON.stringify(sampleBidRequest));
+      localBidRequest.sizes = ['x', 'w'];
+      localBidRequest.mediaTypes = { banner: {} };
+
+      let result = spec.buildRequests([localBidRequest], {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+
+      let imps = payload.imp;
+
+      let firstImp = imps[0];
+
+      expect(firstImp.banner).to.not.be.null;
+
+      let bannerData = firstImp.banner;
+
+      expect(bannerData.w).to.equal(null);
+      expect(bannerData.h).to.equal(null);
+    });
+
+    it('generates a video request as expected', () => {
+      // clone the sample for stability
+      let localBidRequest = JSON.parse(JSON.stringify(sampleBidRequest));
+
+      localBidRequest.mediaTypes = { video: {} };
+
+      let result = spec.buildRequests([localBidRequest], {
+        bidderRequestId: 'sample'
+      });
+
+      // Double encoded JSON
+      let payload = JSON.parse(result.data);
+
+      expect(payload).to.not.be.null;
+
+      let imps = payload.imp;
+
+      let firstImp = imps[0];
+
+      expect(firstImp.video).to.not.be.null;
+
+      let videoData = firstImp.video;
+
+      expect(videoData.w).to.equal(320);
+      expect(videoData.h).to.equal(50);
+    });
+
+    it('propagates the mediaTypes object in the built request', () => {
+      let localBidRequest = JSON.parse(JSON.stringify(sampleBidRequest));
+
+      localBidRequest.mediaTypes = { video: {} };
+
+      let result = spec.buildRequests([localBidRequest], {
+        bidderRequestId: 'sample'
+      });
+
+      let mediaTypes = result.mediaTypes;
+
+      expect(mediaTypes).to.not.be.null;
+      expect(mediaTypes).to.not.be.undefined;
+      expect(mediaTypes.video).to.not.be.null;
+      expect(mediaTypes.video).to.not.be.undefined;
+    });
+  });
+
+  describe('response interpreter', () => {
+    it('returns an empty array when no bids present', () => {
+      // an empty JSON body indicates no ad was found
+
+      let result = spec.interpretResponse({ body: '' }, {})
+
+      expect(result).to.eql([]);
+    });
+
+    it('gracefully fails when a non-JSON body is present', () => {
+      let result = spec.interpretResponse({ body: 'THIS IS NOT <JSON/>' }, {})
+
+      expect(result).to.eql([]);
+    });
+
+    it('returns a valid bid response on sucessful banner request', () => {
+      let incomingRequestId = 'XXtestingXX';
+      let responsePrice = 3.14
+
+      let responseCreative = '<style>\n    body {\n        margin:0px;\n        padding:0px\n    }\n    #RyImgContainer {\n        width:100%;\n        height:100%;\n        position:absolute;\n        background-image: url(\"http://robertwlaschintest.rockyou.com/images/banners/adhawk3_test_728x90.png\");\n        background-size: contain;\n        background-repeat: no-repeat;\n        background-position: center;\n    }\n</style>\n<a href=\"http://tas-qa.rockyou.com/servlet/rotator/273/0/ch?ajkey=V1290DDF4BAJ-573J8400I2011AC181011I276I274QI219QQP0G00G0I2741274D66E000001010000G0PH101H36W8c21bab0e2DW476682DW44d8f2DW4908a2DX1263e094c09197H24X24AC181011AC18101134440BC2H44W7XU01v042DW8659e0a222DW4d04a2DW446612DW4bca22DX12cca633a0680e00G0G01FFG0H84W4http3A2F2FW5https25334125324625W52Fwww2EW9w3schools2EW3com25W62Fhtml25W72Ftryit2EW3asp25X103Ffilename25X153Dtryhtml_basic05\" target=\"_blank\">\n    <div id=\"RyImgContainer\"></div>\n</a><script src=\"http://tas-qa.rockyou.com/servlet/rotator/273/0/impr?ajkey=V1290DDF4BAJ-573J8400I2011AC181011I276I274QI219QQP0G00G0I2741274D66E000001010000G0PH101H36W8c21bab0e2DW476682DW44d8f2DW4908a2DX1263e094c09197H24X24AC181011AC18101134440BC2H44W7XU01v042DW8659e0a222DW4d04a2DW446612DW4bca22DX12cca633a0680e00G0G01FFG0H84W4http3A2F2FW5https25334125324625W52Fwww2EW9w3schools2EW3com25W62Fhtml25W72Ftryit2EW3asp25X103Ffilename25X153Dtryhtml_basic05&obid=${AUCTION_PRICE}\" type=\"text/javascript\"></script>';
+
+      let responseCreativeId = '274';
+      let responseCurrency = 'USD';
+
+      let responseWidth = 300;
+      let responseHeight = 250;
+      let responseTtl = 213;
+
+      let sampleResponse = {
+        id: '66043f5ca44ecd8f8769093b1615b2d9',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: 'c21bab0e-7668-4d8f-908a-63e094c09197',
+                impid: '1',
+                price: responsePrice,
+                adid: responseCreativeId,
+                adm: responseCreative,
+                adomain: [
+                  'www.rockyouteststudios.com'
+                ],
+                cid: '274',
+                attr: [],
+                w: responseWidth,
+                h: responseHeight,
+                ext: {
+                  ttl: responseTtl
+                }
+              }
+            ],
+            seat: '201',
+            group: 0
+          }
+        ],
+        bidid: 'c21bab0e-7668-4d8f-908a-63e094c09197',
+        cur: responseCurrency
+      };
+
+      let sampleRequest = {
+        bidId: incomingRequestId,
+        mediaTypes: { banner: {} },
+        requestId: incomingRequestId
+      };
+
+      let result = spec.interpretResponse(
+        {
+          body: sampleResponse
+        },
+        sampleRequest
+      );
+
+      expect(result.length).to.equal(1);
+
+      let processedBid = result[0];
+
+      // expect(processedBid.requestId).to.equal(incomingRequestId);
+      expect(processedBid.cpm).to.equal(responsePrice);
+      expect(processedBid.width).to.equal(responseWidth);
+      expect(processedBid.height).to.equal(responseHeight);
+      expect(processedBid.ad).to.equal(responseCreative);
+      expect(processedBid.ttl).to.equal(responseTtl);
+      expect(processedBid.creativeId).to.equal(responseCreativeId);
+      expect(processedBid.netRevenue).to.equal(true);
+      expect(processedBid.currency).to.equal(responseCurrency);
+    });
+
+    it('returns an valid bid response on sucessful video request', () => {
+      let incomingRequestId = 'XXtesting-275XX';
+      let responsePrice = 6
+
+      let responseCreative = '<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<VAST version=\"2.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"vast.xsd\">\n    <Ad id=\"01-1101011\">\n        <InLine>\n            <AdSystem version=\"2.0\">Mediatastic</AdSystem>\n            <Impression><![CDATA[https://tas-qa.rockyou.com/servlet/rotator/278/0/impr?ajkey=V1213221C05J-573J8400I2011329C6717J1556I270QI238QQP0G00G0I270127CF0B71G5302EW30061G3302E300001011000G0PH101H36W8a8ae0b482DW4a8db2DW442202DW4ba0c2DX127458f452b1f5H24X24329C6717329C6717448F69C5G0101109G9W9unwrapperG01FFG0G05C]]></Impression><Creatives>\n                <Creative>\n                    <Linear>\n                        <MediaFiles>\n                            <MediaFile delivery=\"progressive\" height=\"3\" type=\"video/mp4\" width=\"4\"><![CDATA[https://cdnrockyou-a.akamaihd.net/apps/socialvideoads/ads/mobiletest/kitchenscramble_15s.mp4]]></MediaFile>\n                        </MediaFiles>\n                        <Duration><![CDATA[00:00:15]]></Duration>\n                        <TrackingEvents/>\n                        <VideoClicks>\n                            <ClickThrough><![CDATA[https://www.facebook.com/KitchenScramble]]></ClickThrough>\n                        <ClickTracking><![CDATA[https://tas-qa.rockyou.com/servlet/rotator/278/0/ch?ajkey=V1213221C05J-573J8400I2011329C6717J1556I270QI238QQP0G00G0I270127CF0B71G5302EW30061G3302E300001011000G0PH101H36W8a8ae0b482DW4a8db2DW442202DW4ba0c2DX127458f452b1f5H24X24329C6717329C6717448F69C5G0101109G9W9unwrapperG01FFG0G05C]]></ClickTracking></VideoClicks>\n                    </Linear>\n                </Creative>\n            </Creatives>\n        </InLine>\n    </Ad>\n</VAST>';
+
+      let responseCreativeId = '1556';
+      let responseCurrency = 'USD';
+
+      let responseWidth = 284;
+      let responseHeight = 285;
+      let responseTtl = 286;
+
+      let sampleResponse = {
+        id: '1234567890',
+        seatbid: [
+          {
+            bid: [
+              {
+                id: 'a8ae0b48-a8db-4220-ba0c-7458f452b1f5',
+                impid: '1',
+                price: responsePrice,
+                adid: responseCreativeId,
+                adm: responseCreative,
+                cid: '270',
+                attr: [],
+                w: responseWidth,
+                h: responseHeight,
+                ext: {
+                  ttl: responseTtl
+                }
+              }
+            ],
+            seat: '201',
+            group: 0
+          }
+        ],
+        bidid: 'a8ae0b48-a8db-4220-ba0c-7458f452b1f5',
+        cur: 'USD'
+      };
+
+      let sampleRequest = {
+        bidId: incomingRequestId,
+        mediaTypes: {
+          video: {
+          }
+        },
+        requestId: incomingRequestId
+      };
+
+      let result = spec.interpretResponse(
+        {
+          body: sampleResponse
+        },
+        sampleRequest
+      );
+
+      expect(result.length).to.equal(1);
+
+      let processedBid = result[0];
+
+      // expect(processedBid.requestId).to.equal(incomingRequestId);
+      expect(processedBid.cpm).to.equal(responsePrice);
+      expect(processedBid.width).to.equal(responseWidth);
+      expect(processedBid.height).to.equal(responseHeight);
+      expect(processedBid.ad).to.equal(null);
+      expect(processedBid.ttl).to.equal(responseTtl);
+      expect(processedBid.creativeId).to.equal(responseCreativeId);
+      expect(processedBid.netRevenue).to.equal(true);
+      expect(processedBid.currency).to.equal(responseCurrency);
+      expect(processedBid.vastXml).to.equal(responseCreative);
+    });
+
+    it('generates event callbacks as expected', () => {
+      let tally = {};
+      let renderer = {
+        handleVideoEvent: (eventObject) => {
+          let eventName = eventObject.eventName;
+          if (tally[eventName]) {
+            tally[eventName] = tally[eventName] + 1;
+          } else {
+            tally[eventName] = 1;
+          }
+        }
+      };
+
+      let callbacks = internals.playerCallbacks(renderer);
+
+      let validCallbacks = ['LOAD', 'IMPRESSION', 'COMPLETE', 'ERROR'];
+
+      validCallbacks.forEach(event => {
+        callbacks('n/a', event);
+      });
+
+      let callbackKeys = Object.keys(tally);
+      expect(callbackKeys.length).to.equal(3);
+      expect(tally['loaded']).to.equal(1);
+      expect(tally['impression']).to.equal(1);
+      expect(tally['ended']).to.equal(2);
+    });
+
+    it('generates a renderer that will hide on complete', () => {
+      let elementName = 'test_element_id';
+      let selector = `#${elementName}`;
+
+      let mockElement = {
+        style: {
+          display: 'some'
+        }
+      };
+
+      document.querySelector = (name) => {
+        if (name === selector) {
+          return mockElement;
+        } else {
+          return null;
+        }
+      };
+
+      let renderer = internals.generateRenderer({}, elementName);
+
+      renderer.handlers['ended']();
+
+      expect(mockElement.style.display).to.equal('none');
+    })
+  });
+});
diff --git a/test/spec/modules/smartadserverBidAdapter_spec.js b/test/spec/modules/smartadserverBidAdapter_spec.js
new file mode 100644
index 00000000000..5cb4a1277fb
--- /dev/null
+++ b/test/spec/modules/smartadserverBidAdapter_spec.js
@@ -0,0 +1,157 @@
+import {
+  expect
+} from 'chai';
+import {
+  spec
+} from 'modules/smartadserverBidAdapter';
+import {
+  getTopWindowLocation
+} from 'src/utils';
+import {
+  newBidder
+} from 'src/adapters/bidderFactory';
+import {
+  config
+} from 'src/config';
+import * as utils from 'src/utils';
+
+describe('Smart ad server bid adapter tests', () => {
+  var DEFAULT_PARAMS = [{
+    adUnitCode: 'sas_42',
+    bidId: 'abcd1234',
+    sizes: [
+      [300, 250],
+      [300, 200]
+    ],
+    bidder: 'smartadserver',
+    params: {
+      domain: 'http://prg.smartadserver.com',
+      siteId: '1234',
+      pageId: '5678',
+      formatId: '90',
+      target: 'test=prebid',
+      bidfloor: 0.420
+    },
+    requestId: 'efgh5678',
+    transactionId: 'zsfgzzg'
+  }];
+
+  var DEFAULT_PARAMS_WO_OPTIONAL = [{
+    adUnitCode: 'sas_42',
+    bidId: 'abcd1234',
+    sizes: [
+      [300, 250],
+      [300, 200]
+    ],
+    bidder: 'smartadserver',
+    params: {
+      domain: 'http://prg.smartadserver.com',
+      siteId: '1234',
+      pageId: '5678',
+      formatId: '90'
+    },
+    requestId: 'efgh5678'
+  }];
+
+  var BID_RESPONSE = {
+    body: {
+      cpm: 12,
+      width: 300,
+      height: 250,
+      creativeId: 'zioeufg',
+      currency: 'GBP',
+      isNetCpm: true,
+      ttl: 300,
+      adUrl: 'http://awesome.fake.url',
+      ad: '< --- awesome script --- >'
+    }
+  };
+
+  it('Verify build request', () => {
+    config.setConfig({
+      'currency': {
+        'adServerCurrency': 'EUR'
+      }
+    });
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    expect(request).to.have.property('url').and.to.equal('http://prg.smartadserver.com/prebid/v1');
+    expect(request).to.have.property('method').and.to.equal('POST');
+    const requestContent = JSON.parse(request.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('90');
+    expect(requestContent).to.have.property('currencyCode').and.to.equal('EUR');
+    expect(requestContent).to.have.property('bidfloor').and.to.equal(0.42);
+    expect(requestContent).to.have.property('targeting').and.to.equal('test=prebid');
+    expect(requestContent).to.have.property('tagId').and.to.equal('sas_42');
+    expect(requestContent).to.have.property('sizes');
+    expect(requestContent.sizes[0]).to.have.property('w').and.to.equal(300);
+    expect(requestContent.sizes[0]).to.have.property('h').and.to.equal(250);
+    expect(requestContent.sizes[1]).to.have.property('w').and.to.equal(300);
+    expect(requestContent.sizes[1]).to.have.property('h').and.to.equal(200);
+    expect(requestContent).to.have.property('pageDomain').and.to.equal(utils.getTopWindowUrl());
+    expect(requestContent).to.have.property('transactionId').and.to.not.equal(null).and.to.not.be.undefined;
+  });
+
+  it('Verify parse response', () => {
+    const request = spec.buildRequests(DEFAULT_PARAMS);
+    const bids = spec.interpretResponse(BID_RESPONSE, request);
+    expect(bids).to.have.lengthOf(1);
+    const bid = bids[0];
+    expect(bid.cpm).to.equal(12);
+    expect(bid.adUrl).to.equal('http://awesome.fake.url');
+    expect(bid.ad).to.equal('< --- awesome script --- >');
+    expect(bid.width).to.equal(300);
+    expect(bid.height).to.equal(250);
+    expect(bid.creativeId).to.equal('zioeufg');
+    expect(bid.currency).to.equal('GBP');
+    expect(bid.netRevenue).to.equal(true);
+    expect(bid.ttl).to.equal(300);
+    expect(bid.requestId).to.equal(DEFAULT_PARAMS[0].bidId);
+    expect(bid.referrer).to.equal(utils.getTopWindowUrl());
+  });
+
+  it('Verifies bidder code', () => {
+    expect(spec.code).to.equal('smartadserver');
+  });
+
+  it('Verifies bidder aliases', () => {
+    expect(spec.aliases).to.have.lengthOf(1);
+    expect(spec.aliases[0]).to.equal('smart');
+  });
+
+  it('Verifies if bid request valid', () => {
+    expect(spec.isBidRequestValid(DEFAULT_PARAMS[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: {
+        pageid: 123
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        siteid: 123
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        formatid: 123,
+        pageid: 234
+      }
+    })).to.equal(false);
+    expect(spec.isBidRequestValid({
+      params: {
+        domain: 'www.test.com',
+        pageid: 234
+      }
+    })).to.equal(false);
+  });
+
+  it('Verifies sync options', () => {
+    expect(spec.getUserSyncs).to.be.undefined;
+  });
+});
diff --git a/test/spec/unit/pbjs_api_spec.js b/test/spec/unit/pbjs_api_spec.js
index c1f7fe82252..9605babf3d9 100644
--- a/test/spec/unit/pbjs_api_spec.js
+++ b/test/spec/unit/pbjs_api_spec.js
@@ -897,54 +897,22 @@ describe('Unit: Prebid Module', function () {
       });
     });
 
-    describe.skip('#video', () => {
+    describe('multiformat requests', () => {
       let spyCallBids;
       let createAuctionStub;
       let adUnits;
 
-      before(() => {
+      beforeEach(() => {
         adUnits = [{
           code: 'adUnit-code',
-          mediaType: 'video',
+          mediaTypes: {
+            banner: {},
+            native: {},
+          },
           sizes: [[300, 250], [300, 600]],
           bids: [
             {bidder: 'appnexus', params: {placementId: 'id'}},
-            {bidder: 'sampleBidder', params: {placementId: 'id'}}
-          ]
-        }];
-        adUnitCodes = ['adUnit-code'];
-        let auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: timeout});
-        spyCallBids = sinon.spy(adaptermanager, 'callBids');
-        createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-        createAuctionStub.returns(auction);
-      });
-
-      after(() => {
-        auctionModule.newAuction.restore();
-        adaptermanager.callBids.restore();
-      });
-
-      it('should not callBids if a video adUnit has non-video bidders', () => {
-        const videoAdaptersBackup = adaptermanager.videoAdapters;
-        adaptermanager.videoAdapters = ['appnexus'];
-        $$PREBID_GLOBAL$$.requestBids({adUnits});
-        sinon.assert.notCalled(adaptermanager.callBids);
-        adaptermanager.videoAdapters = videoAdaptersBackup;
-      });
-    });
-
-    describe('#video', () => {
-      let spyCallBids;
-      let createAuctionStub;
-      let adUnits;
-
-      before(() => {
-        adUnits = [{
-          code: 'adUnit-code',
-          mediaType: 'video',
-          sizes: [[300, 250], [300, 600]],
-          bids: [
-            {bidder: 'appnexus', params: {placementId: 'id'}}
+            {bidder: 'sampleBidder', params: {placementId: 'banner-only-bidder'}}
           ]
         }];
         adUnitCodes = ['adUnit-code'];
@@ -954,53 +922,32 @@ describe('Unit: Prebid Module', function () {
         createAuctionStub.returns(auction);
       })
 
-      after(() => {
+      afterEach(() => {
         auctionModule.newAuction.restore();
         adaptermanager.callBids.restore();
       });
 
-      it('should callBids if a video adUnit has all video bidders', () => {
-        const videoAdaptersBackup = adaptermanager.videoAdapters;
-        adaptermanager.videoAdapters = ['appnexus'];
+      it('bidders that support one of the declared formats are allowed to participate', () => {
         $$PREBID_GLOBAL$$.requestBids({adUnits});
         sinon.assert.calledOnce(adaptermanager.callBids);
-        adaptermanager.videoAdapters = videoAdaptersBackup;
-      });
-    });
 
-    describe('#native', () => {
-      let spyCallBids;
-      let createAuctionStub;
-      let adUnits;
+        const spyArgs = adaptermanager.callBids.getCall(0);
+        const biddersCalled = spyArgs.args[0][0].bids;
 
-      before(() => {
-        adUnits = [{
-          code: 'adUnit-code',
-          mediaType: 'native',
-          sizes: [[300, 250], [300, 600]],
-          bids: [
-            {bidder: 'appnexus', params: {placementId: 'id'}},
-            {bidder: 'sampleBidder', params: {placementId: 'id'}}
-          ]
-        }];
-        adUnitCodes = ['adUnit-code'];
-        let auction = auctionModule.newAuction({adUnits, adUnitCodes, callback: function() {}, cbTimeout: timeout});
-        spyCallBids = sinon.spy(adaptermanager, 'callBids');
-        createAuctionStub = sinon.stub(auctionModule, 'newAuction');
-        createAuctionStub.returns(auction);
+        // appnexus and sampleBidder both support banner
+        expect(biddersCalled.length).to.equal(2);
       });
 
-      after(() => {
-        auctionModule.newAuction.restore();
-        adaptermanager.callBids.restore();
-      });
+      it('bidders that do not support one of the declared formats are dropped', () => {
+        delete adUnits[0].mediaTypes.banner;
 
-      it('should only request native bidders on native adunits', () => {
-        // appnexus is a native bidder, appnexus is not
         $$PREBID_GLOBAL$$.requestBids({adUnits});
         sinon.assert.calledOnce(adaptermanager.callBids);
+
         const spyArgs = adaptermanager.callBids.getCall(0);
         const biddersCalled = spyArgs.args[0][0].bids;
+
+        // only appnexus supports native
         expect(biddersCalled.length).to.equal(1);
       });
     });