From 17f50208439141bc14aa02fd34edc25b98a94375 Mon Sep 17 00:00:00 2001
From: Mansi Nahar <mansinahar@users.noreply.github.com>
Date: Tue, 17 Nov 2020 11:41:50 -0500
Subject: [PATCH] Fix Beachfront JSON tests (#1578)

---
 .../exemplary/minimal-banner.json             |  43 ++--
 .../exemplary/simple-adm-video.json           | 100 ++++----
 .../beachfronttest/exemplary/simple-mix.json  | 136 ++++++-----
 .../exemplary/simple-nurl-video.json          | 130 ++++++-----
 .../minimal-banner-empty_array-200.json       |   2 +-
 .../supplemental/minimal-mobile-video.json    | 112 ++++-----
 .../supplemental/minimal-site-banner.json     | 171 +++++++-------
 .../supplemental/mobile-banner.json           |  28 ++-
 .../supplemental/multi-banner.json            |  24 +-
 .../supplemental/multi-video.json             | 214 ++++++++----------
 .../supplemental/unmarshal-error-banner.json  |   2 +-
 ...nmarshal-error-but-another-good-video.json |   2 +-
 .../supplemental/unmarshal-error-video.json   |   2 +-
 13 files changed, 462 insertions(+), 504 deletions(-)

diff --git a/adapters/beachfront/beachfronttest/exemplary/minimal-banner.json b/adapters/beachfront/beachfronttest/exemplary/minimal-banner.json
index 51ce4e9295e..6672e2af91d 100644
--- a/adapters/beachfront/beachfronttest/exemplary/minimal-banner.json
+++ b/adapters/beachfront/beachfronttest/exemplary/minimal-banner.json
@@ -24,7 +24,6 @@
       }
     ]
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -57,38 +56,40 @@
           "ua": "",
           "adapterName": "BF_PREBID_S2S",
           "adapterVersion": "0.9.0",
-          "user": {
-          }
+          "user": {}
         }
       },
       "mockResponse": {
         "status": 200,
         "body": [
           {
-            "crid":"crid_1",
-            "price":2.942808,
-            "w":300,
-            "h":250,
-            "slot":"div-gpt-ad-1460505748561-0",
-            "adm":"<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
+            "crid": "crid_1",
+            "price": 2.942808,
+            "w": 300,
+            "h": 250,
+            "slot": "div-gpt-ad-1460505748561-0",
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
           }
         ]
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-      "bid": {
-        "id": "12345678",
-        "impid": "test-slot",
-        "price": 2,
-        "adm": "\u003cdiv id=\"12345678\" style=\"width:300;height:250;background-color:black;color:white;\"\u003e300x250\u003c\\div\u003e",
-        "crid": "crid_1",
-        "w": 300,
-        "h": 250
-      },
-      "type": "banner"
+      "bids": [
+        {
+          "bid": {
+            "id": "div-gpt-ad-1460505748561-0Banner",
+            "impid": "div-gpt-ad-1460505748561-0",
+            "price": 2.942808,
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
+            "crid": "crid_1",
+            "w": 300,
+            "h": 250
+          },
+          "type": "banner"
+        }
+      ]
     }
   ]
 }
diff --git a/adapters/beachfront/beachfronttest/exemplary/simple-adm-video.json b/adapters/beachfront/beachfronttest/exemplary/simple-adm-video.json
index 0ff7790b902..cb1f4c2036d 100644
--- a/adapters/beachfront/beachfronttest/exemplary/simple-adm-video.json
+++ b/adapters/beachfront/beachfronttest/exemplary/simple-adm-video.json
@@ -1,34 +1,33 @@
 {
-  "mockBidRequest":
-  {
-    "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-    "tmax":1000,
-    "source":{
-      "tid":"61b87329-8790-47b7-90dd-c53ae7ce1723"
+  "mockBidRequest": {
+    "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+    "tmax": 1000,
+    "source": {
+      "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
     },
-    "imp":[
+    "imp": [
       {
-        "id":"video1",
-        "ext":{
-          "bidder":{
-            "videoResponseType" : "adm",
-            "bidfloor":0.01,
-            "appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76"
+        "id": "video1",
+        "ext": {
+          "bidder": {
+            "videoResponseType": "adm",
+            "bidfloor": 0.01,
+            "appId": "11bc5dd5-7421-4dd8-c926-40fa653bec76"
           }
         },
-        "video":{
-          "mimes":[
+        "video": {
+          "mimes": [
             "video/mp4"
           ],
-          "context":"instream",
-          "w":300,
-          "h":250
+          "context": "instream",
+          "w": 300,
+          "h": 250
         }
       }
     ],
-    "site":{
-      "publisher":{
-        "id":"publisher1"
+    "site": {
+      "publisher": {
+        "id": "publisher1"
       },
       "page": "http://example.com/whatever/something.html"
     },
@@ -42,7 +41,6 @@
       "ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16"
     }
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -63,8 +61,8 @@
             }
           ],
           "site": {
-            "publisher":{
-              "id":"publisher1"
+            "publisher": {
+              "id": "publisher1"
             },
             "page": "http://example.com/whatever/something.html",
             "domain": "example.com"
@@ -75,10 +73,9 @@
             "ip": "192.168.255.255"
           },
           "source": {
-           "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
+            "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
           },
           "tmax": 1000,
-
           "cur": [
             "USD"
           ],
@@ -87,12 +84,12 @@
             "buyeruid": "some-buyer"
           }
         }
-        },
+      },
       "mockResponse": {
-        "status" : 200,
+        "status": 200,
         "body": {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "seatBid":[
+          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+          "seatBid": [
             {
               "bid": [
                 {
@@ -122,31 +119,32 @@
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-
-      "bid":[
+      "bids": [
         {
-          "id": "video1AdmVideo",
-          "impid": "video1",
-          "price": 20,
-          "adm": "<?xml version=\"1.0\" encoding=\"utf-8\"?><VAST version=\"2.0\"><Ad id=\"VPAID\"><InLine><AdSystem version=\"2.0\">IO</AdSystem><AdTitle>Neptune</AdTitle><Impression></Impression><Creatives><Creative sequence=\"1\"><Linear><Duration>00:00:15</Duration><MediaFiles><MediaFile delivery=\"progressive\" width=\"640\" height=\"480\" scalable=\"1\" type=\"application/javascript\" apiFramework=\"VPAID\"><![CDATA[http://player-cdn.beachfrontmedia.com/players/neptune/3/17/5/neptune-player.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{\"dsp\":\"5d8393417cbc8e5aa4fe2202,0.01\",\"inventory_id\":\"bid:95d219a2-6025-44ba-bff8-1dca987beaae:11bc5dd5-7421-4dd8-c926-40fa653bec76:${AUCTION_PRICE}:20.0\",\"request_endpoint\":\"//useast.bfmio.com/getmu\",\"inventory_type\":\"pre\"}]]></AdParameters></Linear></Creative></Creatives></InLine></Ad></VAST>",
-          "adid": "1088",
-          "adomain": [
-            "beachfront.io"
-          ],
-          "cid": "277",
-          "crid": "532",
-          "w": 300,
-          "h": 250,
-          "ext": {
-            "prebid": {
-              "type": "video"
+          "bid": {
+            "id": "video1AdmVideo",
+            "impid": "video1",
+            "price": 20,
+            "adm": "<?xml version=\"1.0\" encoding=\"utf-8\"?><VAST version=\"2.0\"><Ad id=\"VPAID\"><InLine><AdSystem version=\"2.0\">IO</AdSystem><AdTitle>Neptune</AdTitle><Impression></Impression><Creatives><Creative sequence=\"1\"><Linear><Duration>00:00:15</Duration><MediaFiles><MediaFile delivery=\"progressive\" width=\"640\" height=\"480\" scalable=\"1\" type=\"application/javascript\" apiFramework=\"VPAID\"><![CDATA[http://player-cdn.beachfrontmedia.com/players/neptune/3/17/5/neptune-player.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{\"dsp\":\"5d8393417cbc8e5aa4fe2202,0.01\",\"inventory_id\":\"bid:95d219a2-6025-44ba-bff8-1dca987beaae:11bc5dd5-7421-4dd8-c926-40fa653bec76:${AUCTION_PRICE}:20.0\",\"request_endpoint\":\"//useast.bfmio.com/getmu\",\"inventory_type\":\"pre\"}]]></AdParameters></Linear></Creative></Creatives></InLine></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "prebid": {
+                "type": "video"
+              }
             }
-          }
+          },
+          "type": "video"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/adapters/beachfront/beachfronttest/exemplary/simple-mix.json b/adapters/beachfront/beachfronttest/exemplary/simple-mix.json
index eb5d9b07abc..cc2b4158ca2 100644
--- a/adapters/beachfront/beachfronttest/exemplary/simple-mix.json
+++ b/adapters/beachfront/beachfronttest/exemplary/simple-mix.json
@@ -1,25 +1,23 @@
 {
-  "mockBidRequest":
-  {
-    "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-    "tmax":1000,
-    "source":{
-      "tid":"61b87329-8790-47b7-90dd-c53ae7ce1723"
+  "mockBidRequest": {
+    "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+    "tmax": 1000,
+    "source": {
+      "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
     },
-    "imp":[
+    "imp": [
       {
-        "id":"mix1",
-        "ext":{
-          "bidder":{
-            "videoResponseType" : "adm",
-            "bidfloor":0.41,
+        "id": "mix1",
+        "ext": {
+          "bidder": {
+            "videoResponseType": "adm",
+            "bidfloor": 0.41,
             "appIds": {
               "banner": "487cf244-5e95-43cb-e7b9-bb540873ca7e",
               "video": "11bc5dd5-7421-4dd8-c926-40fa653bec76"
             }
           }
         },
-
         "banner": {
           "format": [
             {
@@ -28,18 +26,17 @@
             }
           ]
         },
-
-        "video":{
-          "mimes":[
+        "video": {
+          "mimes": [
             "video/mp4"
           ],
-          "context":"instream",
-          "w":300,
-          "h":250
+          "context": "instream",
+          "w": 300,
+          "h": 250
         }
       }
     ],
-    "site":{
+    "site": {
       "page": "http://example.com/somepage.html"
     },
     "user": {
@@ -51,7 +48,6 @@
       "ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16"
     }
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -89,24 +85,22 @@
           "ip": "192.168.255.255",
           "requestId": "61b87329-8790-47b7-90dd-c53ae7ce1723"
         }
-      } ,
+      },
       "mockResponse": {
-        "status" : 200,
-        "body" :
-          [
-            {
-              "crid":"crid_1",
-              "price":9.5019655,
-              "w":300,
-              "h":250,
-              "slot":"mix1",
-              "adm":"<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
-            }
-          ]
+        "status": 200,
+        "body": [
+          {
+            "crid": "crid_1",
+            "price": 9.5019655,
+            "w": 300,
+            "h": 250,
+            "slot": "mix1",
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
+          }
+        ]
       }
-
-
-    }, {
+    },
+    {
       "expectedRequest": {
         "uri": "https://reachms.bfmio.com/bid.json?exchange_id=11bc5dd5-7421-4dd8-c926-40fa653bec76",
         "body": {
@@ -119,7 +113,6 @@
                 "mimes": [
                   "video/mp4"
                 ]
-
               },
               "bidfloor": 0.41,
               "secure": 0,
@@ -149,7 +142,7 @@
         }
       },
       "mockResponse": {
-        "status" : 200,
+        "status": 200,
         "body": {
           "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
           "seatbid": [
@@ -179,40 +172,41 @@
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-
-      "bid":[
+      "bids": [
         {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "impid":"video1",
-          "price":9.605201,
-          "nurl":"https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
-          "crid":"0d32aea6-d199-4803-a188-bd7cf7be1e12",
-          "w":1500,
-          "h":1280,
-          "ext":{
-            "prebid":{
-              "type":"video"
-            },
-            "bidder":{
-
-            }
-          }
-        }, {
-          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "impid": "mix1",
-          "price": 9.5019655,
-          "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
-          "crid": "crid_1",
-          "w": 300,
-          "h": 250,
-          "ext": {
-            "prebid": {
-              "type": "banner"
-            }
-          }
+          "bid": {
+            "id": "mix1Banner",
+            "impid": "mix1",
+            "price": 9.5019655,
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
+            "crid": "crid_1",
+            "w": 300,
+            "h": 250
+          },
+          "type": "banner"
+        }
+      ]
+    },
+    {
+      "bids": [
+        {
+          "bid": {
+            "id": "mix1AdmVideo",
+            "impid": "mix1",
+            "price": 20,
+            "adm": "<?xml version=\"1.0\" encoding=\"utf-8\"?><VAST version=\"2.0\"><Ad id=\"VPAID\"><InLine><AdSystem version=\"2.0\">IO</AdSystem><AdTitle>Neptune</AdTitle><Impression></Impression><Creatives><Creative sequence=\"1\"><Linear><Duration>00:00:15</Duration><MediaFiles><MediaFile delivery=\"progressive\" width=\"640\" height=\"480\" scalable=\"1\" type=\"application/javascript\" apiFramework=\"VPAID\"><![CDATA[http://player-cdn.beachfrontmedia.com/players/neptune/3/17/5/neptune-player.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{\"dsp\":\"5d839458f73decdc1572b7f6,0.41\",\"inventory_id\":\"bid:26826cf7-f8bb-4e47-a636-769d83dd9b4f:11bc5dd5-7421-4dd8-c926-40fa653bec76:${AUCTION_PRICE}:20.0\",\"request_endpoint\":\"//useast.bfmio.com/getmu\",\"inventory_type\":\"pre\"}]]></AdParameters></Linear></Creative></Creatives></InLine></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 300,
+            "h": 250
+          },
+          "type": "video"
         }
       ]
     }
diff --git a/adapters/beachfront/beachfronttest/exemplary/simple-nurl-video.json b/adapters/beachfront/beachfronttest/exemplary/simple-nurl-video.json
index cc3bfe34007..0f96d9f2b70 100644
--- a/adapters/beachfront/beachfronttest/exemplary/simple-nurl-video.json
+++ b/adapters/beachfront/beachfronttest/exemplary/simple-nurl-video.json
@@ -1,33 +1,32 @@
 {
-  "mockBidRequest":
-  {
-    "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-    "tmax":1000,
-    "source":{
-      "tid":"61b87329-8790-47b7-90dd-c53ae7ce1723"
+  "mockBidRequest": {
+    "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+    "tmax": 1000,
+    "source": {
+      "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
     },
-    "imp":[
+    "imp": [
       {
-        "id":"video1",
-        "ext":{
-          "bidder":{
-            "bidfloor":0.01,
-            "appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76"
+        "id": "video1",
+        "ext": {
+          "bidder": {
+            "bidfloor": 0.01,
+            "appId": "11bc5dd5-7421-4dd8-c926-40fa653bec76"
           }
         },
-        "video":{
-          "mimes":[
+        "video": {
+          "mimes": [
             "video/mp4"
           ],
-          "context":"instream",
-          "w":300,
-          "h":250
+          "context": "instream",
+          "w": 300,
+          "h": 250
         }
       }
     ],
-    "site":{
-      "publisher":{
-        "id":"publisher1"
+    "site": {
+      "publisher": {
+        "id": "publisher1"
       },
       "page": "http://example.com/whatever/something.html"
     },
@@ -41,7 +40,6 @@
       "ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16"
     }
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -63,8 +61,8 @@
             }
           ],
           "site": {
-            "publisher":{
-              "id":"publisher1"
+            "publisher": {
+              "id": "publisher1"
             },
             "page": "http://example.com/whatever/something.html",
             "domain": "example.com"
@@ -75,10 +73,9 @@
             "ip": "192.168.255.255"
           },
           "source": {
-           "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
+            "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
           },
           "tmax": 1000,
-
           "cur": [
             "USD"
           ],
@@ -89,58 +86,57 @@
         }
       },
       "mockResponse": {
-        "status" : 200,
+        "status": 200,
         "body": {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "seatBid":[
-              {
-                "bid": [
-                  {
-                    "id": "video1NurlVideo",
-                    "impid": "video1",
-                    "price": 20,
-                    "nurl": "https://useast.bfmio.com/getBids?aid=bid:70b99087-1b92-4e81-bc42-05c940fd6014:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8391a85f35945a70c9ddf0,0.01&i_type=pre",
-                    "crid": "70b99087-1b92-4e81-bc42-05c940fd6014",
-                    "w": 300,
-                    "h": 250,
-                    "ext": {
-                      "prebid": {
-                        "type": "video"
-                      },
-                      "bidder": {}
-                    }
+          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+          "seatBid": [
+            {
+              "bid": [
+                {
+                  "id": "video1NurlVideo",
+                  "impid": "video1",
+                  "price": 20,
+                  "nurl": "https://useast.bfmio.com/getBids?aid=bid:70b99087-1b92-4e81-bc42-05c940fd6014:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8391a85f35945a70c9ddf0,0.01&i_type=pre",
+                  "crid": "70b99087-1b92-4e81-bc42-05c940fd6014",
+                  "w": 300,
+                  "h": 250,
+                  "ext": {
+                    "prebid": {
+                      "type": "video"
+                    },
+                    "bidder": {}
                   }
-                ],
-                "seat": "beachfront"
-              }
-            ]
+                }
+              ],
+              "seat": "beachfront"
+            }
+          ]
         }
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-
-      "bid":[
+      "bids": [
         {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "impid":"video1",
-          "price":9.605201,
-          "nurl":"https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
-          "crid":"0d32aea6-d199-4803-a188-bd7cf7be1e12",
-          "w":1500,
-          "h":1280,
-          "ext":{
-            "prebid":{
-              "type":"video"
-            },
-            "bidder":{
-
+          "bid": {
+            "id": "video1NurlVideo",
+            "impid": "video1",
+            "price": 20,
+            "nurl": "https://useast.bfmio.com/getBids?aid=bid:70b99087-1b92-4e81-bc42-05c940fd6014:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8391a85f35945a70c9ddf0,0.01&i_type=pre",
+            "crid": "70b99087-1b92-4e81-bc42-05c940fd6014",
+            "w": 300,
+            "h": 250,
+            "ext": {
+              "prebid": {
+                "type": "video"
+              },
+              "bidder": {}
             }
-          }
+          },
+          "type": "video"
         }
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/minimal-banner-empty_array-200.json b/adapters/beachfront/beachfronttest/supplemental/minimal-banner-empty_array-200.json
index 7bdbc73cd5e..01207f22d25 100644
--- a/adapters/beachfront/beachfronttest/supplemental/minimal-banner-empty_array-200.json
+++ b/adapters/beachfront/beachfronttest/supplemental/minimal-banner-empty_array-200.json
@@ -68,5 +68,5 @@
     }
   ],
 
-  "expectedBids": []
+  "expectedBidResponses": []
 }
diff --git a/adapters/beachfront/beachfronttest/supplemental/minimal-mobile-video.json b/adapters/beachfront/beachfronttest/supplemental/minimal-mobile-video.json
index af8b1885ca3..5556f6e7d9c 100644
--- a/adapters/beachfront/beachfronttest/supplemental/minimal-mobile-video.json
+++ b/adapters/beachfront/beachfronttest/supplemental/minimal-mobile-video.json
@@ -2,34 +2,33 @@
   "mockBidRequest": {
     "id": "some_test_ad",
     "app": {
-      "bundle":"_org.prebid.mobile.demoapp",
+      "bundle": "_org.prebid.mobile.demoapp",
       "id": "some-mobile-app"
     },
     "imp": [
       {
-        "id":"video1",
-        "ext":{
-          "bidder":{
-            "bidfloor":0.01,
-            "appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76",
-            "videoResponseType" : "nurl"
+        "id": "video1",
+        "ext": {
+          "bidder": {
+            "bidfloor": 0.01,
+            "appId": "11bc5dd5-7421-4dd8-c926-40fa653bec76",
+            "videoResponseType": "nurl"
           }
         },
-        "video":{
-          "mimes":[
+        "video": {
+          "mimes": [
             "video/mp4"
           ],
-          "w":300,
-          "h":250
+          "w": 300,
+          "h": 250
         }
       }
     ],
-    "device":{
+    "device": {
       "devicetype": 1,
-      "ifa":"bb956625-df13-4568-b60b-eb5cbf76e986"
+      "ifa": "bb956625-df13-4568-b60b-eb5cbf76e986"
     }
   },
-
   "httpCalls": [
     {
       "expectedRequest": {
@@ -48,7 +47,7 @@
               "id": "video1",
               "secure": 0,
               "video": {
-                "mimes":[
+                "mimes": [
                   "video/mp4"
                 ],
                 "h": 250,
@@ -67,71 +66,54 @@
       "mockResponse": {
         "status": 200,
         "body": {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "seatBid":[
+          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+          "seatBid": [
             {
-              "bid":[
+              "bid": [
                 {
-                  "w":0,
-                  "h":0,
+                  "w": 0,
+                  "h": 0,
                   "id": "0",
-                  "impid":"",
-                  "price":0.01,
-                  "adid":"",
-                  "nurl":"https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
-                  "adm":"",
-                  "adomain":[
-
-                  ],
-                  "iurl":"",
-                  "cid":"",
-                  "crid":"",
-                  "attr":[
-
-                  ],
-                  "ext":{
-
-                  },
-                  "cat":[
-
-                  ]
+                  "impid": "",
+                  "price": 0.01,
+                  "adid": "",
+                  "nurl": "https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
+                  "adm": "",
+                  "adomain": [],
+                  "iurl": "",
+                  "cid": "",
+                  "crid": "",
+                  "attr": [],
+                  "ext": {},
+                  "cat": []
                 }
               ],
-              "seat":"",
-              "group":0,
-              "ext":{
-
-              }
+              "seat": "",
+              "group": 0,
+              "ext": {}
             }
           ]
         }
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-
-      "bid":[
+      "bids": [
         {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "impid":"video1",
-          "price":9.605201,
-          "nurl":"https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
-          "crid":"0d32aea6-d199-4803-a188-bd7cf7be1e12",
-          "w":1500,
-          "h":1280,
-          "ext":{
-            "prebid":{
-              "type":"video"
-            },
-            "bidder":{
-
-            }
-          }
+          "bid": {
+            "id": "video1NurlVideo",
+            "impid": "video1",
+            "price": 0.01,
+            "nurl": "https://evt.bfmio.com/getmu?aid=bid:0d32aea6-d199-4803-a188-bd7cf7be1e12:11bc5dd5-7421-4dd8-c926-40fa653bec76:0.01:0.01&v=1&dsp=5afda03c7c2d2bfaee55a3f0,0.01&i_type=pre",
+            "crid": "0d32aea6-d199-4803-a188-bd7cf7be1e12",
+            "w": 300,
+            "h": 250,
+            "ext":{}
+          },
+          "type": "video"
         }
       ]
     }
   ]
-
 }
diff --git a/adapters/beachfront/beachfronttest/supplemental/minimal-site-banner.json b/adapters/beachfront/beachfronttest/supplemental/minimal-site-banner.json
index 27b24357247..a12f7fd9806 100644
--- a/adapters/beachfront/beachfronttest/supplemental/minimal-site-banner.json
+++ b/adapters/beachfront/beachfronttest/supplemental/minimal-site-banner.json
@@ -1,94 +1,95 @@
 {
-    "mockBidRequest": {
-      "id": "some_test_ad",
-      "site": {
-        "page": "test.opposingviews.com"
-      },
-      "imp": [
-        {
-          "bidfloor": 0.02,
-          "banner": {
-            "format": [
-              {
-                "w": 300,
-                "h": 250
-              }
-            ]
-          },
-          "ext": {
-            "bidder": {
-              "bidfloor": 0.02,
-              "appId": "3b16770b-17af-4d22-daff-9606bdf2c9c3"
-            }
-          }
-        }
-      ]
+  "mockBidRequest": {
+    "id": "some_test_ad",
+    "site": {
+      "page": "test.opposingviews.com"
     },
-  
-    "httpCalls": [
+    "imp": [
       {
-        "expectedRequest": {
-          "uri": "https://display.bfmio.com/prebid_display",
-          "body": {
-            "slots": [
-              {
-                "slot": "",
-                "id": "3b16770b-17af-4d22-daff-9606bdf2c9c3",
-                "bidfloor": 0.02,
-                "sizes": [
-                  {
-                    "w": 300,
-                    "h": 250
-                  }
-                ]
-              }
-            ],
-            "domain": "test.opposingviews.com",
-            "page": "test.opposingviews.com",
-            "requestId": "some_test_ad",
-            "referrer": "",
-            "search": "",
-            "secure": 0,
-            "isMobile": 0,
-            "ip": "",
-            "deviceModel": "",
-            "deviceOs": "",
-            "dnt": 0,
-            "ua": "",
-            "adapterName": "BF_PREBID_S2S",
-            "adapterVersion": "0.9.0",
-            "user": {
-            }
-          }
-        },
-        "mockResponse": {
-          "status": 200,
-          "body": [
+        "bidfloor": 0.02,
+        "banner": {
+          "format": [
             {
-              "crid":"crid_1",
-              "price":2.942808,
-              "w":300,
-              "h":250,
-              "slot":"div-gpt-ad-1460505748561-0",
-              "adm":"<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
+              "w": 300,
+              "h": 250
             }
           ]
-        }
-      }
-    ],
-  
-    "expectedBids": [
-      {
-        "bid": {
-          "id": "12345678",
-          "impid": "test-slot",
-          "price": 2,
-          "adm": "\u003cdiv id=\"12345678\" style=\"width:300;height:250;background-color:black;color:white;\"\u003e300x250\u003c\\div\u003e",
-          "crid": "crid_1",
-          "w": 300,
-          "h": 250
         },
-        "type": "banner"
+        "ext": {
+          "bidder": {
+            "bidfloor": 0.02,
+            "appId": "3b16770b-17af-4d22-daff-9606bdf2c9c3"
+          }
+        }
       }
     ]
-  }
+  },
+  "httpCalls": [
+    {
+      "expectedRequest": {
+        "uri": "https://display.bfmio.com/prebid_display",
+        "body": {
+          "slots": [
+            {
+              "slot": "",
+              "id": "3b16770b-17af-4d22-daff-9606bdf2c9c3",
+              "bidfloor": 0.02,
+              "sizes": [
+                {
+                  "w": 300,
+                  "h": 250
+                }
+              ]
+            }
+          ],
+          "domain": "test.opposingviews.com",
+          "page": "test.opposingviews.com",
+          "requestId": "some_test_ad",
+          "referrer": "",
+          "search": "",
+          "secure": 0,
+          "isMobile": 0,
+          "ip": "",
+          "deviceModel": "",
+          "deviceOs": "",
+          "dnt": 0,
+          "ua": "",
+          "adapterName": "BF_PREBID_S2S",
+          "adapterVersion": "0.9.0",
+          "user": {}
+        }
+      },
+      "mockResponse": {
+        "status": 200,
+        "body": [
+          {
+            "crid": "crid_1",
+            "price": 2.942808,
+            "w": 300,
+            "h": 250,
+            "slot": "div-gpt-ad-1460505748561-0",
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>"
+          }
+        ]
+      }
+    }
+  ],
+  "expectedBidResponses": [
+    {
+      "bids": [
+        {
+          "bid": {
+            "id": "div-gpt-ad-1460505748561-0Banner",
+            "impid": "div-gpt-ad-1460505748561-0",
+            "price": 2.942808,
+            "adm": "<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
+            "crid": "crid_1",
+            "w": 300,
+            "h": 250
+          },
+          "type": "banner"
+        }
+      ]
+    }
+  ]
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/mobile-banner.json b/adapters/beachfront/beachfronttest/supplemental/mobile-banner.json
index ea38d7adae7..17cc7d32f54 100644
--- a/adapters/beachfront/beachfronttest/supplemental/mobile-banner.json
+++ b/adapters/beachfront/beachfronttest/supplemental/mobile-banner.json
@@ -109,22 +109,20 @@
     }
   ],
 
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-      "Bid": {
-        "id": "763e3312-19d5-4b07-a61d-890147e863a1",
-        "impid": "div-gpt-ad-1460505748561-0",
-        "price": 2.942808,
-        "adm": "\u003cdiv id=\"12345678\" style=\"width:300;height:250;background-color:black;color:white;\"\u003e300x250\u003c\\div\u003e",
-        "crid": "crid_1",
-        "w": 300,
-        "h": 250
-      },
-      "ext": {
-        "prebid": {
-          "type": "banner"
-        }
-      }
+      "bids": [{
+        "bid": {
+          "id": "div-gpt-ad-1460505748561-0Banner",
+          "impid": "div-gpt-ad-1460505748561-0",
+          "price": 2.942808,
+          "adm":"<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
+          "crid": "crid_1",
+          "w": 300,
+          "h": 250
+        },
+        "type": "banner"
+      }]
     }
   ]
 }
diff --git a/adapters/beachfront/beachfronttest/supplemental/multi-banner.json b/adapters/beachfront/beachfronttest/supplemental/multi-banner.json
index 46699511a9c..1d355dba6fc 100644
--- a/adapters/beachfront/beachfronttest/supplemental/multi-banner.json
+++ b/adapters/beachfront/beachfronttest/supplemental/multi-banner.json
@@ -119,18 +119,20 @@
     }
   ],
 
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-      "Bid": {
-        "id": "12345678",
-        "impid": "test-slot",
-        "price": 2,
-        "adm": "\u003cdiv id=\"12345678\" style=\"width:300;height:250;background-color:black;color:white;\"\u003e300x250\u003c\\div\u003e",
-        "crid": "crid_1",
-        "w": 300,
-        "h": 250
-      },
-      "type": "banner"
+      "bids": [{
+        "bid": {
+          "id": "div-gpt-ad-1460505748561-0Banner",
+          "impid": "div-gpt-ad-1460505748561-0",
+          "price": 2.942808,
+          "adm":"<div id=\"44861168\"><script>!function(){console.log\"Hello, ad.\";}();<\/script><\/div>",
+          "crid": "crid_1",
+          "w": 300,
+          "h": 250
+        },
+        "type": "banner"
+      }]
     }
   ]
 }
diff --git a/adapters/beachfront/beachfronttest/supplemental/multi-video.json b/adapters/beachfront/beachfronttest/supplemental/multi-video.json
index 05f02a4d5b2..8ccd0a8d230 100644
--- a/adapters/beachfront/beachfronttest/supplemental/multi-video.json
+++ b/adapters/beachfront/beachfronttest/supplemental/multi-video.json
@@ -1,35 +1,34 @@
-{ "mockBidRequest":
-  {
-    "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-    "tmax":1000,
-    "source":{
-      "tid":"61b87329-8790-47b7-90dd-c53ae7ce1723"
+{
+  "mockBidRequest": {
+    "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+    "tmax": 1000,
+    "source": {
+      "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
     },
-    "imp":[
+    "imp": [
       {
-        "id":"multivideo",
-        "ext":{
-          "bidder":{
-            "bidfloor":3.01,
+        "id": "multivideo",
+        "ext": {
+          "bidder": {
+            "bidfloor": 3.01,
             "videoResponseType": "both",
-            "appId":"11bc5dd5-7421-4dd8-c926-40fa653bec76"
+            "appId": "11bc5dd5-7421-4dd8-c926-40fa653bec76"
           }
         },
-        "video":{
-          "mimes":[
-            "video/mp4", "video/webm"
+        "video": {
+          "mimes": [
+            "video/mp4",
+            "video/webm"
           ],
-          "context":"instream",
-          "w":600,
-          "h":450
+          "context": "instream",
+          "w": 600,
+          "h": 450
         }
       }
-
-
     ],
-    "site":{
-      "publisher":{
-        "id":"publisher1"
+    "site": {
+      "publisher": {
+        "id": "publisher1"
       },
       "page": "http://example.com/whatever"
     },
@@ -42,16 +41,15 @@
       "ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16"
     }
   },
-
   "httpCalls": [
-      {
+    {
       "expectedRequest": {
         "uri": "https://reachms.bfmio.com/bid.json?exchange_id=11bc5dd5-7421-4dd8-c926-40fa653bec76",
         "body": {
           "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
           "imp": [
             {
-              "id":"multivideo",
+              "id": "multivideo",
               "secure": 0,
               "video": {
                 "mimes": [
@@ -118,132 +116,120 @@
           "cur": "USD"
         }
       }
-    }, {
-
+    },
+    {
       "expectedRequest": {
         "uri": "https://reachms.bfmio.com/bid.json?exchange_id=11bc5dd5-7421-4dd8-c926-40fa653bec76&prebidserver",
         "body": {
-          "isPrebid":true,
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "imp":[
+          "isPrebid": true,
+          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+          "imp": [
             {
-              "id":"multivideo",
+              "id": "multivideo",
               "secure": 0,
-              "video":{
-                "mimes":[
+              "video": {
+                "mimes": [
                   "video/mp4",
                   "video/webm"
                 ],
-                "w":600,
-                "h":450
+                "w": 600,
+                "h": 450
               },
-              "bidfloor":3.01
+              "bidfloor": 3.01
             }
           ],
-          "site":{
-            "domain":"example.com",
-            "page":"http://example.com/whatever",
-            "publisher":{
-              "id":"publisher1"
+          "site": {
+            "domain": "example.com",
+            "page": "http://example.com/whatever",
+            "publisher": {
+              "id": "publisher1"
             }
           },
-          "device":{
-            "ua":"Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16",
-            "ip":"192.168.255.255",
-            "devicetype":2
+          "device": {
+            "ua": "Opera/9.80 (X11; Linux i686; Ubuntu/14.10) Presto/2.12.388 Version/12.16",
+            "ip": "192.168.255.255",
+            "devicetype": 2
           },
-          "user":{
-            "id":"some-user",
-            "buyeruid":"some-buyer"
+          "user": {
+            "id": "some-user",
+            "buyeruid": "some-buyer"
           },
-          "tmax":1000,
-          "cur":[
+          "tmax": 1000,
+          "cur": [
             "USD"
           ],
-          "source":{
-            "tid":"61b87329-8790-47b7-90dd-c53ae7ce1723"
+          "source": {
+            "tid": "61b87329-8790-47b7-90dd-c53ae7ce1723"
           }
         }
       },
-
       "mockResponse": {
         "status": 200,
         "body": {
-          "id":"61b87329-8790-47b7-90dd-c53ae7ce1723",
-          "seatBid":[
+          "id": "61b87329-8790-47b7-90dd-c53ae7ce1723",
+          "seatBid": [
             {
-              "bid":[
+              "bid": [
                 {
-                  "id":"multivideo",
-                  "price":20.0,
-                  "nurl":"https://useast.bfmio.com/getBids?aid=bid:b489a745-e577-4fcb-815d-0b6a1e052ec7:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8231a48d308d0a1f9b4526,0.61&i_type=pre",
-                  "adomain":[
-
-                  ],
-                  "cat":[
-
-                  ],
-                  "attr":[
-
-                  ],
-                  "w":0,
-                  "h":0,
-                  "ext":{
-
-                  }
+                  "id": "multivideo",
+                  "price": 20.0,
+                  "nurl": "https://useast.bfmio.com/getBids?aid=bid:b489a745-e577-4fcb-815d-0b6a1e052ec7:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8231a48d308d0a1f9b4526,0.61&i_type=pre",
+                  "adomain": [],
+                  "cat": [],
+                  "attr": [],
+                  "w": 0,
+                  "h": 0,
+                  "ext": {}
                 }
               ],
-              "group":0,
-              "ext":{
-
-              }
+              "group": 0,
+              "ext": {}
             }
           ]
         }
       }
     }
   ],
-
-  "expectedBids": [
+  "expectedBidResponses": [
     {
-
-      "bid": [
+      "bids": [
         {
-          "id": "multivideoNurlVideo",
-          "impid": "multivideo",
-          "price": 20,
-          "nurl": "https://useast.bfmio.com/getBids?aid=bid:6daefa55-0e8b-4366-b238-bb2de01b0a7c:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8395cb13fe4ef822af7293,3.01&i_type=pre",
-          "crid": "6daefa55-0e8b-4366-b238-bb2de01b0a7c",
-          "w": 600,
-          "h": 450,
-          "ext": {
-            "prebid": {
-              "type": "video"
-            },
-            "bidder": {}
-          }
-        },
+          "bid": {
+            "id": "multivideoAdmVideo",
+            "impid": "multivideo",
+            "price": 20,
+            "adm": "<?xml version=\"1.0\" encoding=\"utf-8\"?><VAST version=\"2.0\"><Ad id=\"VPAID\"><InLine><AdSystem version=\"2.0\">IO</AdSystem><AdTitle>Neptune</AdTitle><Impression></Impression><Creatives><Creative sequence=\"1\"><Linear><Duration>00:00:15</Duration><MediaFiles><MediaFile delivery=\"progressive\" width=\"640\" height=\"480\" scalable=\"1\" type=\"application/javascript\" apiFramework=\"VPAID\"><![CDATA[http://player-cdn.beachfrontmedia.com/players/neptune/3/17/5/neptune-player.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{\"dsp\":\"5d8231a4254b2eca804965a3,3.01\",\"inventory_id\":\"bid:1680831c-83a2-42a3-a790-a683d780749a:11bc5dd5-7421-4dd8-c926-40fa653bec76:${AUCTION_PRICE}:20.0\",\"request_endpoint\":\"//useast.bfmio.com/getmu\",\"inventory_type\":\"pre\"}]]></AdParameters></Linear></Creative></Creatives></InLine></Ad></VAST>",
+            "adid": "1088",
+            "adomain": [
+              "beachfront.io"
+            ],
+            "cid": "277",
+            "crid": "532",
+            "w": 600,
+            "h": 450
+          },
+          "type": "video"
+        }
+      ],
+      "seat": "beachfront"
+    },
+    {
+      "bids": [
         {
-          "id": "multivideoAdmVideo",
-          "impid": "multivideo",
-          "price": 20,
-          "adm": "<?xml version=\"1.0\" encoding=\"utf-8\"?><VAST version=\"2.0\"><Ad id=\"VPAID\"><InLine><AdSystem version=\"2.0\">IO</AdSystem><AdTitle>Neptune</AdTitle><Impression></Impression><Creatives><Creative sequence=\"1\"><Linear><Duration>00:00:15</Duration><MediaFiles><MediaFile delivery=\"progressive\" width=\"640\" height=\"480\" scalable=\"1\" type=\"application/javascript\" apiFramework=\"VPAID\"><![CDATA[http://player-cdn.beachfrontmedia.com/players/neptune/3/17/5/neptune-player.js]]></MediaFile></MediaFiles><AdParameters><![CDATA[{\"dsp\":\"5d8395cb9107b5524e1fd6be,3.01\",\"inventory_id\":\"bid:f3ff87ed-7d92-48d5-8610-40023c318afc:11bc5dd5-7421-4dd8-c926-40fa653bec76:${AUCTION_PRICE}:20.0\",\"request_endpoint\":\"//useast.bfmio.com/getmu\",\"inventory_type\":\"pre\"}]]></AdParameters></Linear></Creative></Creatives></InLine></Ad></VAST>",
-          "adid": "1088",
-          "adomain": [
-            "beachfront.io"
-          ],
-          "cid": "277",
-          "crid": "532",
-          "w": 600,
-          "h": 450,
-          "ext": {
-            "prebid": {
-              "type": "video"
-            }
-          }
+          "bid": {
+            "id": "multivideoNurlVideo",
+            "impid": "multivideo",
+            "price": 20,
+            "nurl": "https://useast.bfmio.com/getBids?aid=bid:b489a745-e577-4fcb-815d-0b6a1e052ec7:11bc5dd5-7421-4dd8-c926-40fa653bec76:20.0:20.0&v=1&dsp=5d8231a48d308d0a1f9b4526,0.61&i_type=pre",
+            "crid": "b489a745-e577-4fcb-815d-0b6a1e052ec7",
+            "w": 600,
+            "h": 450,
+            "ext": {}
+          },
+          "type": "video"
         }
       ],
       "seat": "beachfront"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-banner.json b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-banner.json
index 8a9e6b05863..fc1bb910509 100644
--- a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-banner.json
+++ b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-banner.json
@@ -32,4 +32,4 @@
       "comparison": "literal"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-but-another-good-video.json b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-but-another-good-video.json
index dec0b51bff2..963a2adc8f6 100644
--- a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-but-another-good-video.json
+++ b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-but-another-good-video.json
@@ -169,4 +169,4 @@
       "comparison": "literal"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-video.json b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-video.json
index a2f028ece22..3082ff20c03 100644
--- a/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-video.json
+++ b/adapters/beachfront/beachfronttest/supplemental/unmarshal-error-video.json
@@ -38,4 +38,4 @@
       "comparison": "literal"
     }
   ]
-}
\ No newline at end of file
+}