diff --git a/test/spec/modules/prebidServerBidAdapter_spec.js b/test/spec/modules/prebidServerBidAdapter_spec.js
index 1626d6f2c9d..ad6c4318cc7 100644
--- a/test/spec/modules/prebidServerBidAdapter_spec.js
+++ b/test/spec/modules/prebidServerBidAdapter_spec.js
@@ -879,7 +879,7 @@ describe('S2S Adapter', function () {
       expect(adapter.callBids).to.exist.and.to.be.a('function');
     });
 
-    function mockConsent({applies = true, hasP1Consent = true} = {}) {
+    function mockTCF({applies = true, hasP1Consent = true} = {}) {
       return {
         consentString: 'mockConsent',
         gdprApplies: applies,
@@ -897,7 +897,7 @@ describe('S2S Adapter', function () {
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = mockConsent();
+        gdprBidRequest[0].gdprConsent = mockTCF();
 
         adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, gdprBidRequest), gdprBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
@@ -920,7 +920,7 @@ describe('S2S Adapter', function () {
         config.setConfig(consentConfig);
 
         let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = Object.assign(mockConsent(), {
+        gdprBidRequest[0].gdprConsent = Object.assign(mockTCF(), {
           addtlConsent: 'superduperconsent',
         });
 
@@ -940,69 +940,6 @@ describe('S2S Adapter', function () {
         expect(requestBid.regs).to.not.exist;
         expect(requestBid.user).to.not.exist;
       });
-
-      it('check gdpr info gets added into cookie_sync request: have consent data', function () {
-        let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
-        config.setConfig(consentConfig);
-
-        let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-
-        gdprBidRequest[0].gdprConsent = mockConsent();
-
-        const s2sBidRequest = utils.deepClone(REQUEST);
-        s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
-        let requestBid = JSON.parse(server.requests[0].requestBody);
-
-        expect(requestBid.gdpr).is.equal(1);
-        expect(requestBid.gdpr_consent).is.equal('mockConsent');
-        expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
-        expect(requestBid.account).is.equal('1');
-      });
-
-      it('check gdpr info gets added into cookie_sync request: have consent data but gdprApplies is false', function () {
-        let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
-        config.setConfig(consentConfig);
-
-        const s2sBidRequest = utils.deepClone(REQUEST);
-        s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-        let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = mockConsent({applies: false});
-
-        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
-        let requestBid = JSON.parse(server.requests[0].requestBody);
-
-        expect(requestBid.gdpr).is.equal(0);
-        expect(requestBid.gdpr_consent).is.undefined;
-      });
-
-      it('checks gdpr info gets added to cookie_sync request: applies is false', function () {
-        let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-
-        let consentConfig = { consentManagement: { cmpApi: 'iab' }, s2sConfig: cookieSyncConfig };
-        config.setConfig(consentConfig);
-
-        let gdprBidRequest = utils.deepClone(BID_REQUESTS);
-        gdprBidRequest[0].gdprConsent = mockConsent({applies: false});
-
-        const s2sBidRequest = utils.deepClone(REQUEST);
-        s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-        adapter.callBids(s2sBidRequest, gdprBidRequest, addBidResponse, done, ajax);
-        let requestBid = JSON.parse(server.requests[0].requestBody);
-
-        expect(requestBid.gdpr).is.equal(0);
-        expect(requestBid.gdpr_consent).is.undefined;
-      });
     });
 
     describe('us_privacy (ccpa) consent data', function () {
@@ -1029,25 +966,6 @@ describe('S2S Adapter', function () {
 
         expect(requestBid.regs).to.not.exist;
       });
-
-      it('is added to cookie_sync request when in bidRequest', function () {
-        let cookieSyncConfig = utils.deepClone(CONFIG);
-        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-        config.setConfig({ s2sConfig: cookieSyncConfig });
-
-        let uspBidRequest = utils.deepClone(BID_REQUESTS);
-        uspBidRequest[0].uspConsent = '1YNN';
-
-        const s2sBidRequest = utils.deepClone(REQUEST);
-        s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-        adapter.callBids(s2sBidRequest, uspBidRequest, addBidResponse, done, ajax);
-        let requestBid = JSON.parse(server.requests[0].requestBody);
-
-        expect(requestBid.us_privacy).is.equal('1YNN');
-        expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
-        expect(requestBid.account).is.equal('1');
-      });
     });
 
     describe('gdpr and us_privacy (ccpa) consent data', function () {
@@ -1060,7 +978,7 @@ describe('S2S Adapter', function () {
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1NYN';
-        consentBidRequest[0].gdprConsent = mockConsent();
+        consentBidRequest[0].gdprConsent = mockTCF();
 
         adapter.callBids(addFpdEnrichmentsToS2SRequest(REQUEST, consentBidRequest), consentBidRequest, addBidResponse, done, ajax);
         let requestBid = JSON.parse(server.requests[0].requestBody);
@@ -1086,7 +1004,7 @@ describe('S2S Adapter', function () {
 
         let consentBidRequest = utils.deepClone(BID_REQUESTS);
         consentBidRequest[0].uspConsent = '1YNN';
-        consentBidRequest[0].gdprConsent = mockConsent();
+        consentBidRequest[0].gdprConsent = mockTCF();
 
         const s2sBidRequest = utils.deepClone(REQUEST);
         s2sBidRequest.s2sConfig = cookieSyncConfig
@@ -1843,170 +1761,177 @@ describe('S2S Adapter', function () {
       }]);
     });
 
-    describe('filterSettings', function () {
-      const getRequestBid = userSync => {
-        let cookieSyncConfig = utils.deepClone(CONFIG);
-        const s2sBidRequest = utils.deepClone(REQUEST);
-        cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-        s2sBidRequest.s2sConfig = cookieSyncConfig;
+    describe('cookie sync', () => {
+      let s2sConfig, bidderReqs;
 
-        config.setConfig({ userSync, s2sConfig: cookieSyncConfig });
+      beforeEach(() => {
+        bidderReqs = utils.deepClone(BID_REQUESTS);
+        s2sConfig = utils.deepClone(CONFIG);
+        s2sConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
+      })
 
-        let bidRequest = utils.deepClone(BID_REQUESTS);
-        adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
+      function callCookieSync() {
+        const s2sBidRequest = utils.deepClone(REQUEST);
+        s2sBidRequest.s2sConfig = s2sConfig;
+        config.setConfig({ s2sConfig: s2sConfig });
+        adapter.callBids(s2sBidRequest, bidderReqs, addBidResponse, done, ajax);
         return JSON.parse(server.requests[0].requestBody);
       }
 
-      it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and only the all key is present in userSync.filterSettings', function () {
-        const userSync = {
-          filterSettings: {
-            all: {
-              bidders: ['appnexus', 'rubicon', 'pubmatic'],
-              filter: 'exclude'
+      describe('filterSettings', function () {
+        it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and only the all key is present in userSync.filterSettings', function () {
+          config.setConfig({
+            userSync: {
+              filterSettings: {
+                all: {
+                  bidders: ['appnexus', 'rubicon', 'pubmatic'],
+                  filter: 'exclude'
+                }
+              }
             }
-          }
-        };
-        const requestBid = getRequestBid(userSync);
-
-        expect(requestBid.filterSettings).to.deep.equal({
-          'image': {
-            'bidders': ['appnexus', 'rubicon', 'pubmatic'],
-            'filter': 'exclude'
-          },
-          'iframe': {
-            'bidders': ['appnexus', 'rubicon', 'pubmatic'],
-            'filter': 'exclude'
-          }
+          });
+          expect(callCookieSync().filterSettings).to.deep.equal({
+            'image': {
+              'bidders': ['appnexus', 'rubicon', 'pubmatic'],
+              'filter': 'exclude'
+            },
+            'iframe': {
+              'bidders': ['appnexus', 'rubicon', 'pubmatic'],
+              'filter': 'exclude'
+            }
+          });
         });
-      });
 
-      it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and only the iframe key is present in userSync.filterSettings', function () {
-        const userSync = {
-          filterSettings: {
-            iframe: {
-              bidders: ['rubicon', 'pubmatic'],
-              filter: 'include'
+        it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and only the iframe key is present in userSync.filterSettings', function () {
+          config.setConfig({
+            userSync: {
+              filterSettings: {
+                iframe: {
+                  bidders: ['rubicon', 'pubmatic'],
+                  filter: 'include'
+                }
+              }
             }
-          }
-        };
-        const requestBid = getRequestBid(userSync);
+          })
 
-        expect(requestBid.filterSettings).to.deep.equal({
-          'image': {
-            'bidders': '*',
-            'filter': 'include'
-          },
-          'iframe': {
-            'bidders': ['rubicon', 'pubmatic'],
-            'filter': 'include'
-          }
+          expect(callCookieSync().filterSettings).to.deep.equal({
+            'image': {
+              'bidders': '*',
+              'filter': 'include'
+            },
+            'iframe': {
+              'bidders': ['rubicon', 'pubmatic'],
+              'filter': 'include'
+            }
+          });
         });
-      });
 
-      it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and the image and iframe keys are both present in userSync.filterSettings', function () {
-        const userSync = {
-          filterSettings: {
-            image: {
-              bidders: ['triplelift', 'appnexus'],
-              filter: 'include'
-            },
-            iframe: {
-              bidders: ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
-              filter: 'exclude'
+        it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and the image and iframe keys are both present in userSync.filterSettings', function () {
+          config.setConfig({
+            userSync: {
+              filterSettings: {
+                image: {
+                  bidders: ['triplelift', 'appnexus'],
+                  filter: 'include'
+                },
+                iframe: {
+                  bidders: ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
+                  filter: 'exclude'
+                }
+              }
             }
-          }
-        };
-        const requestBid = getRequestBid(userSync);
+          })
 
-        expect(requestBid.filterSettings).to.deep.equal({
-          'image': {
-            'bidders': ['triplelift', 'appnexus'],
-            'filter': 'include'
-          },
-          'iframe': {
-            'bidders': ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
-            'filter': 'exclude'
-          }
+          expect(callCookieSync().filterSettings).to.deep.equal({
+            'image': {
+              'bidders': ['triplelift', 'appnexus'],
+              'filter': 'include'
+            },
+            'iframe': {
+              'bidders': ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
+              'filter': 'exclude'
+            }
+          });
         });
-      });
 
-      it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and the all and iframe keys are both present in userSync.filterSettings', function () {
-        const userSync = {
-          filterSettings: {
-            all: {
-              bidders: ['triplelift', 'appnexus'],
-              filter: 'include'
-            },
-            iframe: {
-              bidders: ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
-              filter: 'exclude'
+        it('correctly adds filterSettings to the cookie_sync request if userSync.filterSettings is present in the config and the all and iframe keys are both present in userSync.filterSettings', function () {
+          config.setConfig({
+            userSync: {
+              filterSettings: {
+                all: {
+                  bidders: ['triplelift', 'appnexus'],
+                  filter: 'include'
+                },
+                iframe: {
+                  bidders: ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
+                  filter: 'exclude'
+                }
+              }
             }
-          }
-        };
-        const requestBid = getRequestBid(userSync);
+          })
 
-        expect(requestBid.filterSettings).to.deep.equal({
-          'image': {
-            'bidders': ['triplelift', 'appnexus'],
-            'filter': 'include'
-          },
-          'iframe': {
-            'bidders': ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
-            'filter': 'exclude'
-          }
+          expect(callCookieSync().filterSettings).to.deep.equal({
+            'image': {
+              'bidders': ['triplelift', 'appnexus'],
+              'filter': 'include'
+            },
+            'iframe': {
+              'bidders': ['pulsepoint', 'triplelift', 'appnexus', 'rubicon'],
+              'filter': 'exclude'
+            }
+          });
         });
       });
-    });
 
-    it('adds limit to the cookie_sync request if userSyncLimit is greater than 0', function () {
-      let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-      cookieSyncConfig.userSyncLimit = 1;
-
-      const s2sBidRequest = utils.deepClone(REQUEST);
-      s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-      config.setConfig({ s2sConfig: cookieSyncConfig });
-
-      let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
-
-      expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
-      expect(requestBid.account).is.equal('1');
-      expect(requestBid.limit).is.equal(1);
-    });
-
-    it('does not add limit to cooke_sync request if userSyncLimit is missing or 0', function () {
-      let cookieSyncConfig = utils.deepClone(CONFIG);
-      cookieSyncConfig.syncEndpoint = { p1Consent: 'https://prebid.adnxs.com/pbs/v1/cookie_sync' };
-      config.setConfig({ s2sConfig: cookieSyncConfig });
-
-      const s2sBidRequest = utils.deepClone(REQUEST);
-      s2sBidRequest.s2sConfig = cookieSyncConfig;
-
-      let bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(s2sBidRequest, bidRequest, addBidResponse, done, ajax);
-      let requestBid = JSON.parse(server.requests[0].requestBody);
+      describe('limit', () => {
+        it('is added to request if userSyncLimit is greater than 0', function () {
+          s2sConfig.userSyncLimit = 1;
+          const req = callCookieSync();
+          expect(req.limit).is.equal(1);
+        });
 
-      expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
-      expect(requestBid.account).is.equal('1');
-      expect(requestBid.limit).is.undefined;
+        Object.entries({
+          'missing': () => null,
+          '0': () => { s2sConfig.userSyncLimit = 0; }
+        }).forEach(([t, setup]) => {
+          it(`is not added to request if userSyncLimit is ${t}`, () => {
+            setup();
+            const req = callCookieSync();
+            expect(req.limit).to.not.exist;
+          });
+        });
+      });
 
-      cookieSyncConfig.userSyncLimit = 0;
-      config.resetConfig();
-      config.setConfig({ s2sConfig: cookieSyncConfig });
+      describe('gdpr data is set', () => {
+        it('when we have consent data', function () {
+          bidderReqs[0].gdprConsent = mockTCF();
+          const req = callCookieSync();
+          expect(req.gdpr).is.equal(1);
+          expect(req.gdpr_consent).is.equal('mockConsent');
+        });
 
-      const s2sBidRequest2 = utils.deepClone(REQUEST);
-      s2sBidRequest2.s2sConfig = cookieSyncConfig;
+        it('when gdprApplies is false', () => {
+          bidderReqs[0].gdprConsent = mockTCF({applies: false});
+          const req = callCookieSync();
+          expect(req.gdpr).is.equal(0);
+          expect(req.gdpr_consent).is.undefined;
+        });
+      });
 
-      bidRequest = utils.deepClone(BID_REQUESTS);
-      adapter.callBids(s2sBidRequest2, bidRequest, addBidResponse, done, ajax);
-      requestBid = JSON.parse(server.requests[0].requestBody);
+      it('adds USP data from bidder request', () => {
+        bidderReqs[0].uspConsent = '1YNN';
+        expect(callCookieSync().us_privacy).to.equal('1YNN');
+      });
 
-      expect(requestBid.bidders).to.contain('appnexus').and.to.have.lengthOf(1);
-      expect(requestBid.account).is.equal('1');
-      expect(requestBid.limit).is.undefined;
+      it('adds GPP data from bidder requests', () => {
+        bidderReqs[0].gppConsent = {
+          applicableSections: [1, 2, 3],
+          gppString: 'mock-string'
+        };
+        const req = callCookieSync();
+        expect(req.gpp).to.eql('mock-string');
+        expect(req.gpp_sid).to.eql('1,2,3');
+      });
     });
 
     it('adds s2sConfig adapterOptions to request for ORTB', function () {