diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000..8a64d74
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,32 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  go:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go-version: [1.18.x, 1.19.x]
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go-version }}
+          cache: true
+      - run: make test
+  golangci:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
+        with:
+          go-version: 1.x
+          cache: true
+      - uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dc6f263
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.makefile
+
+.idea
+.vscode
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 62da91f..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-language: go
-sudo: false
-go:
-  - 1.6.4
-  - 1.7.4
-install:
-  - go get -u -t ./...
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f731b7e
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
+(The MIT License)
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Some test examples were taken from:
+https://code.google.com/p/openrtb/wiki/OpenRTB_Examples
diff --git a/README.md b/README.md
index 92d134e..12f487b 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,12 @@
-# Go OpenRTB v2.x
+# OpenRTB
 
 [![Build Status](https://travis-ci.org/UnityTech/openrtb.svg?branch=master)](https://travis-ci.org/UnityTech/openrtb)
 
-OpenRTB implementation for Go
+OpenRTB structs and validations for Go.
+
+## Requirements
+
+Requires Go 1.8+ for proper `json.RawMessage` marshaling.
 
 ## Installation
 
@@ -14,13 +18,12 @@ go get github.com/UnityTech/openrtb
 
 ## Usage
 
-Import the package:
-
 ```go
 package main
 
 import (
   "log"
+
   "github.com/UnityTech/openrtb"
 )
 
@@ -32,38 +35,10 @@ func main() {
   defer file.Close()
 
   var req *openrtb.BidRequest
-  err = json.NewDecoder(file).Decode(&req)
-  if err != nil {
+  if err := json.NewDecoder(file).Decode(&req); err != nil {
     log.Fatal(err)
   }
 
   log.Printf("%+v\n", req)
 }
 ```
-
-## Licence
-
-    Copyright (c) 2015 Black Square Media Ltd. All rights reserved.
-    (The MIT License)
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    'Software'), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-    Some test examples were taken from:
-    https://code.google.com/p/openrtb/wiki/OpenRTB_Examples
diff --git a/audio.go b/audio.go
index 5dd8a03..2ef6b8f 100644
--- a/audio.go
+++ b/audio.go
@@ -10,7 +10,7 @@ var (
 	ErrInvalidAudioNoMimes = errors.New("openrtb: audio has no mimes")
 )
 
-// The "audio" object must be included directly in the impression object
+// Audio object must be included directly in the impression object
 type Audio struct {
 	Mimes         []string  `json:"mimes"`                 // Content MIME types supported.
 	MinDuration   int       `json:"minduration,omitempty"` // Minimum video ad duration in seconds
@@ -35,7 +35,7 @@ type Audio struct {
 
 type jsonAudio Audio
 
-// Validates the object
+// Validate the object
 func (a *Audio) Validate() error {
 	if len(a.Mimes) == 0 {
 		return ErrInvalidAudioNoMimes
diff --git a/audio_test.go b/audio_test.go
index 4a4937e..6cd95bd 100644
--- a/audio_test.go
+++ b/audio_test.go
@@ -1,58 +1,62 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Audio", func() {
+func TestAudio(t *testing.T) {
 	var subject *Audio
+	if err := fixture("audio", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("audio", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Audio{
-			Mimes: []string{
-				"audio/mp4",
-			},
-			MinDuration: 5,
-			MaxDuration: 30,
-			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
-			Sequence:    1,
-			BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended: 30,
-			MinBitrate:  300,
-			MaxBitrate:  1500,
-			Delivery:    []int{ContentDeliveryProgressive},
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
-			},
-			API:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&Audio{
-			MinDuration: 5,
-			MaxDuration: 30,
-			Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
-			Sequence:    1,
-			BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended: 30,
-			MinBitrate:  300,
-			MaxBitrate:  1500,
-			Delivery:    []int{ContentDeliveryProgressive},
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
-			},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
-		}).Validate()).To(Equal(ErrInvalidAudioNoMimes))
-	})
+	exp := &Audio{
+		Mimes: []string{
+			"audio/mp4",
+		},
+		MinDuration: 5,
+		MaxDuration: 30,
+		Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+		Sequence:    1,
+		BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+		MaxExtended: 30,
+		MinBitrate:  300,
+		MaxBitrate:  1500,
+		Delivery:    []int{ContentDeliveryProgressive},
+		CompanionAd: []Banner{
+			{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+			{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+		},
+		API:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
+		CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-})
+func TestAudio_Validate(t *testing.T) {
+	subject := &Audio{
+		MinDuration: 5,
+		MaxDuration: 30,
+		Protocols:   []int{AudioProtocolDAAST1, AudioProtocolDAAST1Wrapper},
+		Sequence:    1,
+		BAttr:       []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+		MaxExtended: 30,
+		MinBitrate:  300,
+		MaxBitrate:  1500,
+		Delivery:    []int{ContentDeliveryProgressive},
+		CompanionAd: []Banner{
+			{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+			{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+		},
+		CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
+	}
+	if exp, got := ErrInvalidAudioNoMimes, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
diff --git a/banner.go b/banner.go
index 4b34d49..5b6f049 100644
--- a/banner.go
+++ b/banner.go
@@ -1,6 +1,6 @@
 package openrtb
 
-// The "banner" object must be included directly in the impression object if the impression offered
+// Banner object must be included directly in the impression object if the impression offered
 // for auction is display or rich media, or it may be optionally embedded in the video object to
 // describe the companion banners available for the linear or non-linear video ad.  The banner
 // object may include a unique identifier; this can be useful if these IDs can be leveraged in the
diff --git a/banner_test.go b/banner_test.go
index a8f8787..8ed96f9 100644
--- a/banner_test.go
+++ b/banner_test.go
@@ -1,27 +1,28 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Banner", func() {
+func TestBanner(t *testing.T) {
 	var subject *Banner
+	if err := fixture("banner", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("banner", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Banner{
-			W:     728,
-			H:     90,
-			Pos:   AdPosAboveFold,
-			BType: []int{BannerTypeFrame},
-			BAttr: []int{CreativeAttributeWindowsDialogOrAlert},
-			Api:   []int{APIFrameworkMRAID1},
-		}))
-	})
-
-})
+	exp := &Banner{
+		W:     728,
+		H:     90,
+		Pos:   AdPosAboveFold,
+		BType: []int{BannerTypeFrame},
+		BAttr: []int{CreativeAttributeWindowsDialogOrAlert},
+		Api:   []int{APIFrameworkMRAID1},
+		VCM:   1,
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/bench_test.go b/bench_test.go
index c90b2dd..4f20fb2 100644
--- a/bench_test.go
+++ b/bench_test.go
@@ -2,13 +2,13 @@ package openrtb
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 )
 
 func BenchmarkBidRequest_Unmarshal(b *testing.B) {
-	data, err := ioutil.ReadFile(filepath.Join("testdata", "breq.video.json"))
+	data, err := os.ReadFile(filepath.Join("testdata", "breq.video.json"))
 	if err != nil {
 		b.Fatal(err.Error())
 	}
@@ -23,7 +23,7 @@ func BenchmarkBidRequest_Unmarshal(b *testing.B) {
 }
 
 func BenchmarkBidRequest_Marshal(b *testing.B) {
-	data, err := ioutil.ReadFile(filepath.Join("testdata", "breq.video.json"))
+	data, err := os.ReadFile(filepath.Join("testdata", "breq.video.json"))
 	if err != nil {
 		b.Fatal(err.Error())
 	}
diff --git a/bid.go b/bid.go
index 3ce69c2..23f7350 100644
--- a/bid.go
+++ b/bid.go
@@ -8,6 +8,7 @@ var (
 	ErrInvalidBidNoImpID = errors.New("openrtb: bid is missing impression ID")
 )
 
+// Bid object contains bid information.
 // ID, ImpID and Price are required; all other optional.
 // If the bidder wins the impression, the exchange calls notice URL (nurl)
 // a) to inform the bidder of the win;
@@ -32,7 +33,7 @@ type Bid struct {
 	Tactic         string         `json:"tactic,omitempty"`         // Tactic ID to enable buyers to label bids for reporting to the exchange the tactic through which their bid was submitted.
 	Cat            []string       `json:"cat,omitempty"`            // IAB content categories of the creative. Refer to List 5.1
 	Attr           []int          `json:"attr,omitempty"`           // Array of creative attributes.
-	API            int            `json:"api,omitempty"`            // API required by the markup if applicable
+	API            int            `json:"api,omitempty"`            // API required by the markup if applicable, NOTE: for ORTB ver <= 2.5 APIFramework supported is 1 to 6.
 	Protocol       int            `json:"protocol,omitempty"`       // Video response protocol of the markup if applicable
 	QAGMediaRating int            `json:"qagmediarating,omitempty"` // Creative media rating per IQG guidelines.
 	Language       string         `json:"language,omitempty"`       // Language of the creative using ISO-639-1-alpha-2.
@@ -41,11 +42,19 @@ type Bid struct {
 	W              int            `json:"w,omitempty"`              // Width of the ad in pixels.
 	WRatio         int            `json:"wratio,omitempty"`         // Relative width of the creative when expressing size as a ratio.
 	HRatio         int            `json:"hratio,omitempty"`         // Relative height of the creative when expressing size as a ratio.
-	Exp            int            `json:"exp,omitempty"`            // Advisory as to the number of seconds the bidder is willing to wait between the auction and the actual impression.
-	ContentType    string         `json:"-"`                        // Content of the bid
-	MediaType      string         `json:"-"`                        // Media of the impression e.g. video/display
-	IsOMEnabled    bool           `json:"-"`                        // Flag to send indicate to the Sdk whether or not to run om scripts
-	Ext            Extension      `json:"ext,omitempty"`
+
+	APIS             []int             `json:"apis,omitempty"`      // APIS required by the markup if applicable.
+	LangB            string            `json:"langb,omitempty"`     // Language of the creative using IETF BCP 47. Only one of language or langb should be present.
+	Duration         int               `json:"dur,omitempty"`       // Duration of the video or audio creative in seconds.
+	MarkupType       MarkupType        `json:"mtype,omitempty"`     // Creative markup so that it can properly be associated.
+	SlotInPod        SlotPositionInPod `json:"slotinpod,omitempty"` // Indicates that the bid response is only eligible for a specific position.
+	CategoryTaxonomy CategoryTaxonomy  `json:"cattax,omitempty"`    // Defines the taxonomy in use.
+
+	Exp         int       `json:"exp,omitempty"` // Advisory as to the number of seconds the bidder is willing to wait between the auction and the actual impression.
+	ContentType string    `json:"-"`             // Content of the bid
+	MediaType   string    `json:"-"`             // Media of the impression e.g. video/display
+	IsOMEnabled bool      `json:"-"`             // Flag to send indicate to the Sdk whether or not to run om scripts
+	Ext         Extension `json:"ext,omitempty"`
 }
 
 // Validate required attributes
diff --git a/bid_test.go b/bid_test.go
index efdb610..46b4492 100644
--- a/bid_test.go
+++ b/bid_test.go
@@ -1,76 +1,74 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Bid", func() {
+func TestBid(t *testing.T) {
 	var subject *Bid
+	if err := fixture("bid", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("bid", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Bid{
-			ID:         "1",
-			ImpID:      "1",
-			Price:      0.751371,
-			AdID:       "52a5516d29e435137c6f6e74",
-			NURL:       "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
-			AdMarkup:   "<html/>",
-			AdvDomain:  []string{"ads.com"},
-			IURL:       "http://ads.com/112770_1386565997.jpeg",
-			CampaignID: "52a5516d29e435137c6f6e74",
-			CreativeID: "52a5516d29e435137c6f6e74_1386565997",
-			DealID:     "example_deal",
-			Attr:       []int{},
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&Bid{}).Validate()).To(Equal(ErrInvalidBidNoID))
-		Expect((&Bid{ID: "BIDID"}).Validate()).To(Equal(ErrInvalidBidNoImpID))
-		Expect(subject.Validate()).NotTo(HaveOccurred())
-	})
+	exp := &Bid{
+		ID:         "1",
+		ImpID:      "1",
+		Price:      0.751371,
+		AdID:       "52a5516d29e435137c6f6e74",
+		NURL:       "http://ads.com/win/112770_1386565997?won=${AUCTION_PRICE}",
+		AdMarkup:   "<html/>",
+		AdvDomain:  []string{"ads.com"},
+		IURL:       "http://ads.com/112770_1386565997.jpeg",
+		CampaignID: "52a5516d29e435137c6f6e74",
+		CreativeID: "52a5516d29e435137c6f6e74_1386565997",
+		DealID:     "example_deal",
+		Attr:       []int{},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-})
+func TestBid_Validate(t *testing.T) {
+	subject := &Bid{}
+	if exp, got := ErrInvalidBidNoID, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &Bid{ID: "BIDID"}
+	if exp, got := ErrInvalidBidNoImpID, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
 
-var _ = Describe("Loopme AR Bid", func() {
+func TestLoopmeARBid(t *testing.T) {
 	var subject *Bid
+	if err := fixture("bid.loopme.ar", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("bid.loopme.ar", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Bid{
-			ID:         "5d4b3b3be8250678c813f475",
-			ImpID:      "1",
-			Price:      29.7,
-			AdID:       "2056515",
-			NURL:       "https://us.fake-url.com/tr?et=BID_WIN&a_ecp=29.7&a_price=${AUCTION_PRICE:BF}&name=imp_nurl",
-			AdMarkup:   "<img>",
-			AdvDomain:  []string{"unity.com"},
-			IURL:       "https://fake-url.net/assets/2690-e3c0-aa99-9efd38cd1fa6.jpg",
-			CampaignID: "2001626",
-			CreativeID: "2056515",
-			Attr:       []int{99},
-			Protocol:   2,
-			Cat:        []string{"IAB19"},
-			LURL:       "https://fake-url.com?et=BID_LOSS&meta=&a_id=${AUCTION_ID}&a_bid_id=${AUCTION_BID_ID}&a_loss_id=${AUCTION_LOSS}",
-			H:          320,
-			W:          480,
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&Bid{}).Validate()).To(Equal(ErrInvalidBidNoID))
-		Expect((&Bid{ID: "BIDID"}).Validate()).To(Equal(ErrInvalidBidNoImpID))
-		Expect(subject.Validate()).NotTo(HaveOccurred())
-	})
-
-})
+	exp := &Bid{
+		ID:         "5d4b3b3be8250678c813f475",
+		ImpID:      "1",
+		Price:      29.7,
+		AdID:       "2056515",
+		NURL:       "https://us.fake-url.com/tr?et=BID_WIN&a_ecp=29.7&a_price=${AUCTION_PRICE:BF}&name=imp_nurl",
+		AdMarkup:   "<img>",
+		AdvDomain:  []string{"unity.com"},
+		IURL:       "https://fake-url.net/assets/2690-e3c0-aa99-9efd38cd1fa6.jpg",
+		CampaignID: "2001626",
+		CreativeID: "2056515",
+		Attr:       []int{99},
+		Protocol:   2,
+		Cat:        []string{"IAB19"},
+		LURL:       "https://fake-url.com?et=BID_LOSS&meta=&a_id=${AUCTION_ID}&a_bid_id=${AUCTION_BID_ID}&a_loss_id=${AUCTION_LOSS}",
+		H:          320,
+		W:          480,
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/bidrequest.go b/bidrequest.go
index 3f34695..4c88c39 100644
--- a/bidrequest.go
+++ b/bidrequest.go
@@ -1,6 +1,8 @@
 package openrtb
 
-import "errors"
+import (
+	"errors"
+)
 
 // Validation errors
 var (
@@ -9,7 +11,7 @@ var (
 	ErrInvalidReqMultiInv = errors.New("openrtb: request has multiple inventory sources") // has site and app
 )
 
-// The top-level bid request object contains a globally unique bid request or auction ID.  This "id"
+// BidRequest is the top-level bid request object contains a globally unique bid request or auction ID.  This "id"
 // attribute is required as is at least one "imp" (i.e., impression) object.  Other attributes are
 // optional since an exchange may establish default values.
 type BidRequest struct {
@@ -24,7 +26,8 @@ type BidRequest struct {
 	TMax        int          `json:"tmax,omitempty"`    // Maximum amount of time in milliseconds to submit a bid
 	WSeat       []string     `json:"wseat,omitempty"`   // Array of buyer seats allowed to bid on this auction
 	BSeat       []string     `json:"bseat,omitempty"`   // Array of buyer seats blocked to bid on this auction
-	WLang       []string     `json:"wlang,omitempty"`   // Array of languages for creatives using ISO-639-1-alpha-2
+	WLang       []string     `json:"wlang,omitempty"`   // Allowed list of languages for creatives using ISO-639-1-alpha-2. Omission implies no specific restrictions, but buyers would be advised to consider language attribute in the Device and/or Content objects if available. Only one of wlang or wlangb should be present.
+	LanguagesB  []string     `json:"wlangb,omitempty"`  // Allowed list of languages for creatives using IETF BCP 47I. Omission implies no specific restrictions, but buyers would be advised to consider language attribute in the Device and/or Content objects if available. Only one of wlang or wlangb should be present.
 	AllImps     int          `json:"allimps,omitempty"` // Flag to indicate whether exchange can verify that all impressions offered represent all of the impressions available in context, Default: 0
 	Cur         []string     `json:"cur,omitempty"`     // Array of allowed currencies
 	Bcat        []string     `json:"bcat,omitempty"`    // Blocked Advertiser Categories.
@@ -37,7 +40,7 @@ type BidRequest struct {
 	Pmp *Pmp `json:"pmp,omitempty"` // DEPRECATED: kept for backwards compatibility
 }
 
-// Validates the request
+// Validate the request
 func (req *BidRequest) Validate() error {
 	if req.ID == "" {
 		return ErrInvalidReqNoID
@@ -47,7 +50,8 @@ func (req *BidRequest) Validate() error {
 		return ErrInvalidReqMultiInv
 	}
 
-	for _, imp := range req.Imp {
+	for i := range req.Imp {
+		imp := req.Imp[i]
 		if err := (&imp).Validate(); err != nil {
 			return err
 		}
diff --git a/bidrequest_test.go b/bidrequest_test.go
index 68dc085..b2630ba 100644
--- a/bidrequest_test.go
+++ b/bidrequest_test.go
@@ -1,79 +1,88 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("BidRequest", func() {
+func TestBidRequest(t *testing.T) {
 	var subject *BidRequest
-	privacyPolicy := 1
-	BeforeEach(func() {
-		err := fixture("breq.banner", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse complex requests", func() {
-		for _, kind := range []string{"exp", "video", "native"} {
-			var req *BidRequest
-			err := fixture("breq."+kind, &req)
-			Expect(err).NotTo(HaveOccurred(), "for %s", kind)
-			Expect(req.Validate()).NotTo(HaveOccurred(), "for %s", kind)
-		}
-	})
+	if err := fixture("breq.banner", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&BidRequest{
-			ID: "1234534625254",
-			Imp: []Impression{
-				{
-					ID:     "1",
-					Secure: 1,
-					Banner: &Banner{W: 300, H: 250, Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated}},
-				},
+	privacyPolicy := 1
+	exp := &BidRequest{
+		ID: "1234534625254",
+		Imp: []Impression{
+			{
+				ID:     "1",
+				Secure: 1,
+				Banner: &Banner{W: 300, H: 250, Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated}},
 			},
-			Site: &Site{
-				Inventory: Inventory{
-					ID:            "234563",
-					Name:          "Site ABCD",
-					Domain:        "siteabcd.com",
-					Cat:           []string{"IAB2-1", "IAB2-2"},
-					Publisher:     &Publisher{ID: "pub12345", Name: "Publisher A"},
-					PrivacyPolicy: &privacyPolicy,
-					Content: &Content{
-						Keywords: "keyword a,keyword b,keyword c",
-					},
+		},
+		Site: &Site{
+			Inventory: Inventory{
+				ID:            "234563",
+				Name:          "Site ABCD",
+				Domain:        "siteabcd.com",
+				Cat:           []string{string(ContentCategoryAutoParts), string(ContentCategoryAutoRepair)},
+				Publisher:     &Publisher{ID: "pub12345", Name: "Publisher A"},
+				PrivacyPolicy: &privacyPolicy,
+				Content: &Content{
+					Keywords: "keyword a,keyword b,keyword c",
 				},
-				Page: "http://siteabcd.com/page.htm",
-				Ref:  "http://referringsite.com/referringpage.htm",
 			},
-			Device: &Device{
-				UA:       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16",
-				IP:       "64.124.253.1",
-				OS:       "OS X",
-				JS:       1,
-				FlashVer: "10.1",
-			},
-			User: &User{
-				ID:       "45asdf987656789adfad4678rew656789",
-				BuyerUID: "5df678asd8987656asdf78987654",
-			},
-			Test:        1,
-			AuctionType: 2,
-			TMax:        120,
-			BAdv:        []string{"company1.com", "company2.com"},
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&BidRequest{}).Validate()).To(Equal(ErrInvalidReqNoID))
-		Expect((&BidRequest{ID: "A"}).Validate()).To(Equal(ErrInvalidReqNoImps))
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}).Validate()).To(Equal(ErrInvalidReqMultiInv))
+			Page: "http://siteabcd.com/page.htm",
+			Ref:  "http://referringsite.com/referringpage.htm",
+		},
+		Device: &Device{
+			UA:       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.16) Gecko/20110319 Firefox/3.6.16",
+			IP:       "64.124.253.1",
+			OS:       "OS X",
+			JS:       1,
+			FlashVer: "10.1",
+		},
+		User: &User{
+			ID:       "45asdf987656789adfad4678rew656789",
+			BuyerUID: "5df678asd8987656asdf78987654",
+		},
+		Test:        1,
+		AuctionType: 2,
+		TMax:        120,
+		BAdv:        []string{"company1.com", "company2.com"},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}}).Validate()).NotTo(HaveOccurred())
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}, Site: &Site{}}).Validate()).NotTo(HaveOccurred())
-		Expect((&BidRequest{ID: "A", Imp: []Impression{{ID: "1", Banner: &Banner{}}}, App: &App{}}).Validate()).NotTo(HaveOccurred())
-		Expect(subject.Validate()).NotTo(HaveOccurred())
-	})
+func TestBidRequest_complex(t *testing.T) {
+	for _, kind := range []string{"exp", "video", "native"} {
+		var subject *BidRequest
+		if err := fixture("breq."+kind, &subject); err != nil {
+			t.Fatalf("expected no error, got %v", err)
+		}
+		if err := subject.Validate(); err != nil {
+			t.Fatalf("expected no error, got %v", err)
+		}
+	}
+}
 
-})
+func TestBidRequest_Validate(t *testing.T) {
+	subject := &BidRequest{}
+	if exp, got := ErrInvalidReqNoID, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &BidRequest{ID: "RID"}
+	if exp, got := ErrInvalidReqNoImps, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &BidRequest{ID: "A", Imp: []Impression{{ID: "1"}}, Site: &Site{}, App: &App{}}
+	if exp, got := ErrInvalidReqMultiInv, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
diff --git a/bidresponse.go b/bidresponse.go
index a759e2a..345fbb4 100644
--- a/bidresponse.go
+++ b/bidresponse.go
@@ -1,6 +1,8 @@
 package openrtb
 
-import "errors"
+import (
+	"errors"
+)
 
 // Validation errors
 var (
@@ -8,6 +10,7 @@ var (
 	ErrInvalidRespNoSeatBids = errors.New("openrtb: response missing seatbids")
 )
 
+// BidResponse is the bid response wrapper object.
 // ID and at least one "seatbid” object is required, which contains a bid on at least one impression.
 // Other attributes are optional since an exchange may establish default values.
 // No-Bids on all impressions should be indicated as a HTTP 204 response.
@@ -30,11 +33,11 @@ func (res *BidResponse) Validate() error {
 		return ErrInvalidRespNoSeatBids
 	}
 
-	for _, sb := range res.SeatBid {
-		if err := sb.Validate(); err != nil {
+	for i := range res.SeatBid {
+		sb := res.SeatBid[i]
+		if err := (&sb).Validate(); err != nil {
 			return err
 		}
 	}
-
 	return nil
 }
diff --git a/bidresponse_test.go b/bidresponse_test.go
index 8f81f17..d858f57 100644
--- a/bidresponse_test.go
+++ b/bidresponse_test.go
@@ -1,57 +1,66 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("BidResponse", func() {
+func TestBidResponse(t *testing.T) {
 	var subject *BidResponse
+	if err := fixture("bres.single", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("bres.single", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse complex responses", func() {
-		for _, kind := range []string{"multi", "pmp", "vast"} {
-			var req *BidResponse
-			err := fixture("bres."+kind, &req)
-			Expect(err).NotTo(HaveOccurred(), "for %s", kind)
-			Expect(req.Validate()).NotTo(HaveOccurred(), "for %s", kind)
-		}
-	})
-
-	It("should parse responses", func() {
-		Expect(subject).To(Equal(&BidResponse{
-			ID: "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
-			SeatBid: []SeatBid{
-				{
-					Bid: []Bid{
-						{
-							ID:         "32a69c6ba388f110487f9d1e63f77b22d86e916b",
-							ImpID:      "32a69c6ba388f110487f9d1e63f77b22d86e916b",
-							Price:      0.065445,
-							AdID:       "529833ce55314b19e8796116",
-							NURL:       "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
-							AdMarkup:   "<iframe src=\"foo.bar\"/>",
-							AdvDomain:  []string{},
-							CampaignID: "529833ce55314b19e8796116",
-							CreativeID: "529833ce55314b19e8796116_1385706446",
-							Attr:       []int{},
-						},
+	exp := &BidResponse{
+		ID: "BID-4-ZIMP-4b309eae-504a-4252-a8a8-4c8ceee9791a",
+		SeatBid: []SeatBid{
+			{
+				Bid: []Bid{
+					{
+						ID:         "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+						ImpID:      "32a69c6ba388f110487f9d1e63f77b22d86e916b",
+						Price:      0.065445,
+						AdID:       "529833ce55314b19e8796116",
+						NURL:       "http://ads.com/win/529833ce55314b19e8796116?won=${auction_price}",
+						AdMarkup:   "<iframe src=\"foo.bar\"/>",
+						AdvDomain:  []string{},
+						CampaignID: "529833ce55314b19e8796116",
+						CreativeID: "529833ce55314b19e8796116_1385706446",
+						Attr:       []int{},
 					},
-					Seat: "772",
 				},
+				Seat: "772",
 			},
-			Currency: "USD",
-		}))
-	})
+		},
+		Currency: "USD",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-	It("should validate", func() {
-		Expect((&BidResponse{}).Validate()).To(Equal(ErrInvalidRespNoID))
-		Expect((&BidResponse{ID: "RESPID"}).Validate()).To(Equal(ErrInvalidRespNoSeatBids))
-		Expect(subject.Validate()).NotTo(HaveOccurred())
-	})
+func TestBidResponse_complex(t *testing.T) {
+	for _, kind := range []string{"multi", "pmp", "vast"} {
+		var subject *BidResponse
+		if err := fixture("bres."+kind, &subject); err != nil {
+			t.Fatalf("expected no error, got %v", err)
+		}
+		if err := subject.Validate(); err != nil {
+			t.Fatalf("expected no error, got %v", err)
+		}
+	}
+}
 
-})
+func TestBidResponse_Validate(t *testing.T) {
+	subject := &BidResponse{}
+	if exp, got := ErrInvalidRespNoID, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &BidResponse{ID: "RID"}
+	if exp, got := ErrInvalidRespNoSeatBids, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
diff --git a/content.go b/content.go
index e8ae2ac..fc75af3 100644
--- a/content.go
+++ b/content.go
@@ -1,35 +1,40 @@
 package openrtb
 
-// This object describes the content in which the impression will appear, which may be syndicated or nonsyndicated
+// Content object describes the content in which the impression will appear, which may be syndicated or nonsyndicated
 // content. This object may be useful when syndicated content contains impressions and does
 // not necessarily match the publisher's general content. The exchange might or might not have
 // knowledge of the page where the content is running, as a result of the syndication method. For
 // example might be a video impression embedded in an iframe on an unknown web property or device.
 type Content struct {
-	ID                 string    `json:"id,omitempty"`                 // ID uniquely identifying the content.
-	Episode            int       `json:"episode,omitempty"`            // Episode number (typically applies to video content).
-	Title              string    `json:"title,omitempty"`              // Content title.
-	Series             string    `json:"series,omitempty"`             // Content series.
-	Season             string    `json:"season,omitempty"`             // Content season.
-	Artist             string    `json:"artist,omitempty"`             // Artist credited with the content.
-	Genre              string    `json:"genre,omitempty"`              // Genre that best describes the content
-	Album              string    `json:"album,omiyempty"`              // Album to which the content belongs; typically for audio.
-	ISRC               string    `json:"isrc,omitempty"`               // International Standard Recording Code conforming to ISO - 3901.
-	Producer           *Producer `json:"producer,omitempty"`           // The producer.
-	URL                string    `json:"url,omitempty"`                // URL of the content, for buy-side contextualization or review.
-	Cat                []string  `json:"cat,omitempty"`                // Array of IAB content categories that describe the content.
-	ProdQuality        int       `json:"prodq,omitempty"`              // Production quality per IAB's classification.
-	VideoQuality       int       `json:"videoquality,omitempty"`       // Video quality per IAB's classification.
-	Context            int       `json:"context,omitempty"`            // Type of content (game, video, text, etc.).
-	ContentRating      string    `json:"contentrating,omitempty"`      // Content rating (e.g., MPAA).
-	UserRating         string    `json:"userrating,omitempty"`         // User rating of the content (e.g., number of stars, likes, etc.).
-	QAGMediaRating     int       `json:"qagmediarating,omitempty"`     // Media rating per QAG guidelines.
-	Keywords           string    `json:"keywords,omitempty"`           // Comma separated list of keywords describing the content.
-	LiveStream         int       `json:"livestream,omitempty"`         // 0 = not live, 1 = content is live (e.g., stream, live blog).
-	SourceRelationship int       `json:"sourcerelationship,omitempty"` // 0 = indirect, 1 = direct.
-	Len                int       `json:"len,omitempty"`                // Length of content in seconds; appropriate for video or audio.
-	Language           string    `json:"language,omitempty"`           // Content language using ISO-639-1-alpha-2.
-	Embeddable         int       `json:"embeddable,omitempty"`         // Indicator of whether or not the content is embeddable (e.g., an embeddable video player), where 0 = no, 1 = yes.
-	Data               []Data    `json:"data,omitempty"`               // Additional content data.
-	Ext                Extension `json:"ext,omitempty"`
+	ID                 string           `json:"id,omitempty"`                 // ID uniquely identifying the content.
+	Episode            int              `json:"episode,omitempty"`            // Episode number (typically applies to video content).
+	Title              string           `json:"title,omitempty"`              // Content title.
+	Series             string           `json:"series,omitempty"`             // Content series.
+	Season             string           `json:"season,omitempty"`             // Content season.
+	Artist             string           `json:"artist,omitempty"`             // Artist credited with the content.
+	Genre              string           `json:"genre,omitempty"`              // Genre that best describes the content
+	Album              string           `json:"album,omitempty"`              // Album to which the content belongs; typically for audio.
+	ISRC               string           `json:"isrc,omitempty"`               // International Standard Recording Code conforming to ISO - 3901.
+	Producer           *Producer        `json:"producer,omitempty"`           // The producer.
+	URL                string           `json:"url,omitempty"`                // URL of the content, for buy-side contextualization or review.
+	CategoryTaxonomy   CategoryTaxonomy `json:"cattax,omitempty"`             // Defines the taxonomy in use.
+	Cat                []string         `json:"cat,omitempty"`                // Array of IAB content categories that describe the content.
+	ProdQuality        int              `json:"prodq,omitempty"`              // Production quality per IAB's classification.
+	VideoQuality       int              `json:"videoquality,omitempty"`       // DEPRECATED. Video quality per IAB's classification.
+	Context            int              `json:"context,omitempty"`            // Type of content (game, video, text, etc.).
+	ContentRating      string           `json:"contentrating,omitempty"`      // Content rating (e.g., MPAA).
+	UserRating         string           `json:"userrating,omitempty"`         // User rating of the content (e.g., number of stars, likes, etc.).
+	QAGMediaRating     int              `json:"qagmediarating,omitempty"`     // Media rating per QAG guidelines.
+	Keywords           string           `json:"keywords,omitempty"`           // Comma separated list of keywords describing the content.
+	LiveStream         int              `json:"livestream,omitempty"`         // 0 = not live, 1 = content is live (e.g., stream, live blog).
+	SourceRelationship int              `json:"sourcerelationship,omitempty"` // 0 = indirect, 1 = direct.
+	Len                int              `json:"len,omitempty"`                // Length of content in seconds; appropriate for video or audio.
+	Language           string           `json:"language,omitempty"`           // Content language using ISO-639-1-alpha-2.
+	LanguageB          string           `json:"langb,omitempty"`              // Content language using IETF BCP 47. Only one of language or langb should be present.
+	Embeddable         int              `json:"embeddable,omitempty"`         // Indicator of whether or not the content is embeddable (e.g., an embeddable video player), where 0 = no, 1 = yes.
+	Data               []Data           `json:"data,omitempty"`               // Additional content data.
+	Network            *ChannelEntity   `json:"network,omitempty"`            // Details about the network the content is on.
+	Channel            *ChannelEntity   `json:"channel,omitempty"`            // Details about the channel the content is on.
+	KwArray            []string         `json:"kwarray,omitempty"`            // Array of keywords about the site. Only one of ‘keywords’ or‘kwarray’ may be present.
+	Ext                Extension        `json:"ext,omitempty"`
 }
diff --git a/content_test.go b/content_test.go
index 08e035d..d02e9f8 100644
--- a/content_test.go
+++ b/content_test.go
@@ -1,28 +1,55 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Content", func() {
+func TestContent(t *testing.T) {
 	var subject *Content
+	if err := fixture("content", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("content", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
+	exp := &Content{
+		ID:    "1",
+		Title: "Video",
+		Producer: &Producer{
+			ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+			Name:   "yahoo",
+			Domain: "www.yahoo.com",
+		},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Content{
-			ID:    "1",
-			Title: "Video",
-			Producer: &Producer{
-				ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
-				Name:   "yahoo",
-				Domain: "www.yahoo.com",
-			},
-		}))
-	})
+func TestContent_quoted(t *testing.T) {
+	var subject *Content
+	if err := fixture("content.quoted", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-})
+	exp := &Content{
+		Keywords:           "Orwell, 1984",
+		UserRating:         "3",
+		Episode:            1,
+		Title:              "This is the video title",
+		URL:                "http://cdnp.tremormedia.com/video/1984.flv",
+		LiveStream:         0,
+		ContentRating:      "G",
+		Len:                129,
+		Series:             "book reading",
+		VideoQuality:       2,
+		Context:            1,
+		Season:             "1",
+		SourceRelationship: 0,
+		ID:                 "eb9f13ede5fd225333971523f6042f9d",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/device.go b/device.go
index 460e4d6..26706e9 100644
--- a/device.go
+++ b/device.go
@@ -1,39 +1,41 @@
 package openrtb
 
-// The "device" object provides information pertaining to the device including its hardware,
+// Device object provides information pertaining to the device including its hardware,
 // platform, location, and carrier. This device can refer to a mobile handset, a desktop computer,
 // set top box or other digital device.
 type Device struct {
-	UA         string    `json:"ua,omitempty"`         // User agent
-	Geo        *Geo      `json:"geo,omitempty"`        // Location of the device assumed to be the user’s current location
-	DNT        int       `json:"dnt,omitempty"`        // "1": Do not track
-	LMT        int       `json:"lmt,omitempty"`        // "1": Limit Ad Tracking
-	IP         string    `json:"ip,omitempty"`         // IPv4
-	IPv6       string    `json:"ipv6,omitempty"`       // IPv6
-	DeviceType int       `json:"devicetype,omitempty"` // The general type of device.
-	Make       string    `json:"make,omitempty"`       // Device make
-	Model      string    `json:"model,omitempty"`      // Device model
-	OS         string    `json:"os,omitempty"`         // Device OS
-	OSVer      string    `json:"osv,omitempty"`        // Device OS version
-	HwVer      string    `json:"hwv,omitempty"`        // Hardware version of the device (e.g., "5S" for iPhone 5S).
-	H          int       `json:"h,omitempty"`          // Physical height of the screen in pixels.
-	W          int       `json:"w,omitempty"`          // Physical width of the screen in pixels.
-	PPI        int       `json:"ppi,omitempty"`        // Screen size as pixels per linear inch.
-	PxRatio    float64   `json:"pxratio,omitempty"`    // The ratio of physical pixels to device independent pixels.
-	JS         int       `json:"js,omitempty"`         // Javascript status ("0": Disabled, "1": Enabled)
-	GeoFetch   int       `json:"geofetch,omitempty"`   // Indicates if the geolocation API will be available to JavaScript code running in the banner,
-	FlashVer   string    `json:"flashver,omitempty"`   // Flash version
-	Language   string    `json:"language,omitempty"`   // Browser language
-	Carrier    string    `json:"carrier,omitempty"`    // Carrier or ISP derived from the IP address
-	MCCMNC     string    `json:"mccmnc,omitempty"`     // Mobile carrier as the concatenated MCC-MNC code (e.g., "310-005" identifies Verizon Wireless CDMA in the USA).
-	ConnType   int       `json:"connectiontype"`       // Network connection type.
-	IFA        string    `json:"ifa,omitempty"`        // Native identifier for advertisers
-	IDSHA1     string    `json:"didsha1,omitempty"`    // SHA1 hashed device ID
-	IDMD5      string    `json:"didmd5,omitempty"`     // MD5 hashed device ID
-	PIDSHA1    string    `json:"dpidsha1,omitempty"`   // SHA1 hashed platform device ID
-	PIDMD5     string    `json:"dpidmd5,omitempty"`    // MD5 hashed platform device ID
-	MacSHA1    string    `json:"macsha1,omitempty"`    // SHA1 hashed device ID; IMEI when available, else MEID or ESN
-	MacMD5     string    `json:"macmd5,omitempty"`     // MD5 hashed device ID; IMEI when available, else MEID or ESN
-	OAID       string    `json:"oaid,omitempty"`       // Open Advertising Tracking ID
-	Ext        Extension `json:"ext,omitempty"`
+	UA         string     `json:"ua,omitempty"`             // User agent
+	Sua        *UserAgent `json:"sua,omitempty"`            // Structured User agent. It's more accurate than UA
+	Geo        *Geo       `json:"geo,omitempty"`            // Location of the device assumed to be the user’s current location
+	DNT        int        `json:"dnt,omitempty"`            // "1": Do not track
+	LMT        int        `json:"lmt,omitempty"`            // "1": Limit Ad Tracking
+	IP         string     `json:"ip,omitempty"`             // IPv4
+	IPv6       string     `json:"ipv6,omitempty"`           // IPv6
+	DeviceType int        `json:"devicetype,omitempty"`     // The general type of device.
+	Make       string     `json:"make,omitempty"`           // Device make
+	Model      string     `json:"model,omitempty"`          // Device model
+	OS         string     `json:"os,omitempty"`             // Device OS
+	OSVer      string     `json:"osv,omitempty"`            // Device OS version
+	HwVer      string     `json:"hwv,omitempty"`            // Hardware version of the device (e.g., "5S" for iPhone 5S).
+	H          int        `json:"h,omitempty"`              // Physical height of the screen in pixels.
+	W          int        `json:"w,omitempty"`              // Physical width of the screen in pixels.
+	PPI        int        `json:"ppi,omitempty"`            // Screen size as pixels per linear inch.
+	PxRatio    float64    `json:"pxratio,omitempty"`        // The ratio of physical pixels to device independent pixels.
+	JS         int        `json:"js,omitempty"`             // Javascript status ("0": Disabled, "1": Enabled)
+	GeoFetch   int        `json:"geofetch,omitempty"`       // Indicates if the geolocation API will be available to JavaScript code running in the banner,
+	FlashVer   string     `json:"flashver,omitempty"`       // Flash version
+	Language   string     `json:"language,omitempty"`       // Browser language
+	LanguageB  string     `json:"langb,omitempty"`          // Browser language using IETF BCP 47. Only one of language or langb should be present.
+	Carrier    string     `json:"carrier,omitempty"`        // Carrier or ISP derived from the IP address
+	MCCMNC     string     `json:"mccmnc,omitempty"`         // Mobile carrier as the concatenated MCC-MNC code (e.g., "310-005" identifies Verizon Wireless CDMA in the USA).
+	ConnType   int        `json:"connectiontype,omitempty"` // Network connection type.
+	IFA        string     `json:"ifa,omitempty"`            // Native identifier for advertisers
+	IDSHA1     string     `json:"didsha1,omitempty"`        // SHA1 hashed device ID
+	IDMD5      string     `json:"didmd5,omitempty"`         // MD5 hashed device ID
+	PIDSHA1    string     `json:"dpidsha1,omitempty"`       // SHA1 hashed platform device ID
+	PIDMD5     string     `json:"dpidmd5,omitempty"`        // MD5 hashed platform device ID
+	MacSHA1    string     `json:"macsha1,omitempty"`        // SHA1 hashed device ID; IMEI when available, else MEID or ESN
+	MacMD5     string     `json:"macmd5,omitempty"`         // MD5 hashed device ID; IMEI when available, else MEID or ESN
+	OAID       string     `json:"oaid,omitempty"`           // Open Advertising Tracking ID
+	Ext        Extension  `json:"ext,omitempty"`
 }
diff --git a/device_test.go b/device_test.go
index a43d8ec..14a41d1 100644
--- a/device_test.go
+++ b/device_test.go
@@ -1,45 +1,46 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Device", func() {
+func TestDevice(t *testing.T) {
 	var subject *Device
+	if err := fixture("device", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("device", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Device{
-			DNT: 0,
-			UA:  "Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3",
-			IP:  "123.145.167.189",
-			Geo: &Geo{
-				Lat:     35.012345,
-				Lon:     -115.12345,
-				Country: "USA",
-				Region:  "CA",
-				Metro:   "803",
-				City:    "Los Angeles",
-				Zip:     "90049",
-			},
-			PIDSHA1:    "AA000DFE74168477C70D291f574D344790E0BB11",
-			PIDMD5:     "AA003EABFB29E6F759F3BDAB34E50BB11",
-			Carrier:    "310-410",
-			Language:   "en",
-			Make:       "Apple",
-			Model:      "iPhone",
-			OS:         "iOS",
-			OSVer:      "6.1",
-			JS:         1,
-			ConnType:   ConnTypeCell,
-			MCCMNC:     "722-341",
-			DeviceType: DeviceTypeMobile,
-			OAID:       "1fe9a970-efbb-29e0-0bdd-f5dbbf751ab5",
-		}))
-	})
-})
+	exp := &Device{
+		DNT: 0,
+		UA:  "Mozilla/5.0 (iPhone; CPU iPhone OS 6_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3",
+		IP:  "123.145.167.189",
+		Geo: &Geo{
+			Lat:     35.012345,
+			Lon:     -115.12345,
+			Country: "USA",
+			Region:  "CA",
+			Metro:   "803",
+			City:    "Los Angeles",
+			Zip:     "90049",
+		},
+		PIDSHA1:    "AA000DFE74168477C70D291f574D344790E0BB11",
+		PIDMD5:     "AA003EABFB29E6F759F3BDAB34E50BB11",
+		Carrier:    "310-410",
+		Language:   "en",
+		Make:       "Apple",
+		Model:      "iPhone",
+		OS:         "iOS",
+		OSVer:      "6.1",
+		JS:         1,
+		ConnType:   ConnTypeCell,
+		MCCMNC:     "722-341",
+		DeviceType: DeviceTypeMobile,
+		OAID:       "1fe9a970-efbb-29e0-0bdd-f5dbbf751ab5",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/doc.go b/doc.go
index de7b323..629162e 100644
--- a/doc.go
+++ b/doc.go
@@ -1,5 +1,5 @@
 /*
-This package implements a parser (with optional validation) and a generator for
+Package openrtb implements a parser (with optional validation) and a generator for
 OpenRTB 2.x requests and responses.
 */
 package openrtb
diff --git a/extension.go b/extension.go
index df82b29..4398ecb 100644
--- a/extension.go
+++ b/extension.go
@@ -1,16 +1,17 @@
 package openrtb
 
-import "errors"
+import (
+	"encoding/json"
+	"errors"
+)
 
 // Extension is a raw encoded JSON value.
-// It implements Marshaler and Unmarshaler, defined in encoding/json package,
-// works similarly to Extension,
-// but does not need to be used as pointer for proper JSON marshaling.
-type Extension []byte
+// It implements Marshaler and Unmarshaler, defined in encoding/json package
+type Extension json.RawMessage
 
 // MarshalJSON returns e as the JSON encoding of e.
 func (e Extension) MarshalJSON() ([]byte, error) {
-	return e, nil
+	return json.RawMessage(e).MarshalJSON()
 }
 
 // UnmarshalJSON sets *e to a copy of data.
@@ -18,6 +19,5 @@ func (e *Extension) UnmarshalJSON(data []byte) error {
 	if e == nil {
 		return errors.New("openrtb.Extension: UnmarshalJSON on nil pointer")
 	}
-	*e = append((*e)[0:0], data...)
-	return nil
+	return (*json.RawMessage)(e).UnmarshalJSON(data)
 }
diff --git a/extension_test.go b/extension_test.go
index 7a16c84..2c4b407 100644
--- a/extension_test.go
+++ b/extension_test.go
@@ -1,29 +1,39 @@
-package openrtb
+package openrtb_test
 
 import (
 	"encoding/json"
+	"reflect"
+	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Extension", func() {
+func TestExtension(t *testing.T) {
 	var _ json.Marshaler = (Extension)(nil)
 	var _ json.Unmarshaler = (*Extension)(nil)
 
-	It("should marshal JSON", func() {
+	t.Run("should marshal JSON", func(t *testing.T) {
 		subject := Extension(`{"foo":"bar"}`)
 
-		b, err := json.Marshal(subject)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(b).To(Equal([]byte(`{"foo":"bar"}`)))
+		got, err := json.Marshal(subject)
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+		exp := []byte(`{"foo":"bar"}`)
+		if !reflect.DeepEqual(exp, got) {
+			t.Errorf("expected %+v, got %+v", exp, got)
+		}
 	})
 
-	It("should unmarshal JSON", func() {
+	t.Run("should unmarshal JSON", func(t *testing.T) {
 		subject := Extension([]byte{})
-
 		err := json.Unmarshal([]byte(`{"foo":"bar"}`), &subject)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(subject).To(Equal(Extension(`{"foo":"bar"}`)))
+		if err != nil {
+			t.Fatal(err.Error())
+		}
+		exp := Extension(`{"foo":"bar"}`)
+		if got := subject; !reflect.DeepEqual(exp, got) {
+			t.Errorf("expected %+v, got %+v", exp, got)
+		}
 	})
-})
+}
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..305b62c
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module github.com/UnityTech/openrtb
+
+go 1.13
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..e69de29
diff --git a/impression.go b/impression.go
index 50aea68..2f93b16 100644
--- a/impression.go
+++ b/impression.go
@@ -8,7 +8,7 @@ var (
 	ErrInvalidImpMultiAssets = errors.New("openrtb: impression has multiple assets") // at least two out of Banner, Video, Native
 )
 
-// The "imp" object describes the ad position or impression being auctioned.  A single bid request
+// Impression or the "imp" object describes the ad position or impression being auctioned. A single bid request
 // can include multiple "imp" objects, a use case for which might be an exchange that supports
 // selling all ad positions on a given page as a bundle.  Each "imp" object has a required ID so that
 // bids can reference them individually.  An exchange can also conduct private auctions by
@@ -30,12 +30,13 @@ type Impression struct {
 	BidFloor          float64        `json:"bidfloor,omitempty"`          // Bid floor for this impression in CPM
 	BidFloorCurrency  string         `json:"bidfloorcur,omitempty"`       // Currency of bid floor
 	Secure            NumberOrString `json:"secure,omitempty"`            // Flag to indicate whether the impression requires secure HTTPS URL creative assets and markup.
+	Quantity          *Quantity      `json:"qty,omitempty"`               // Includes the impression multiplier, and describes its source.
 	Exp               int            `json:"exp,omitempty"`               // Advisory as to the number of seconds that may elapse between the auction and the actual impression.
 	IFrameBuster      []string       `json:"iframebuster,omitempty"`      // Array of names for supportediframe busters.
 	ContentType       string         `json:"-"`                           // Used to attribute bid to a content - not sent in request
 	MediaType         string         `json:"-"`                           // media of the impression e.g. video/display
+	Rewarded          int            `json:"rwdd"`                        //Indicates whether the user receives a reward for viewing the ad
 	Ext               Extension      `json:"ext,omitempty"`
-	Rewarded          int            `json:"rwdd"` //Indicates whether the user receives a reward for viewing the ad
 }
 
 func (imp *Impression) assetCount() int {
@@ -52,7 +53,7 @@ func (imp *Impression) assetCount() int {
 	return n
 }
 
-// Validates the `imp` object
+// Validate the `imp` object
 func (imp *Impression) Validate() error {
 	if imp.ID == "" {
 		return ErrInvalidImpNoID
@@ -67,6 +68,11 @@ func (imp *Impression) Validate() error {
 			return err
 		}
 	}
+	if imp.Quantity != nil {
+		if err := imp.Quantity.Validate(); err != nil {
+			return err
+		}
+	}
 
 	return nil
 }
diff --git a/impression_test.go b/impression_test.go
index e7a104f..7498c4a 100644
--- a/impression_test.go
+++ b/impression_test.go
@@ -1,56 +1,65 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Impression", func() {
+func TestImpression(t *testing.T) {
 	var subject *Impression
+	if err := fixture("impression", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("impression", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Impression{
-			ID: "1",
-			Metric: []*Metric{
-				{
-					Type:   "viewable_percentage_1",
-					Value:  0.99,
-					Vendor: "MOAT",
-				},
-				{
-					Type:   "viewable_percentage_2",
-					Value:  0.98,
-					Vendor: "MOAT",
-				},
+	exp := &Impression{
+		ID: "1",
+		Metric: []*Metric{
+			{
+				Type:   "viewable_percentage_1",
+				Value:  0.99,
+				Vendor: "MOAT",
 			},
-			Banner: &Banner{
-				W: 300,
-				H: 250,
+			{
+				Type:   "viewable_percentage_2",
+				Value:  0.98,
+				Vendor: "MOAT",
 			},
-			BidFloor: 0.03,
-			Pmp: &Pmp{
-				Private: 1,
-				Deals: []Deal{
-					{
-						ID:          "DX-1985-010A",
-						BidFloor:    2.5,
-						AuctionType: 2,
-					},
+		},
+		Banner: &Banner{
+			W: 300,
+			H: 250,
+		},
+		BidFloor: 0.03,
+		Pmp: &Pmp{
+			Private: 1,
+			Deals: []Deal{
+				{
+					ID:          "DX-1985-010A",
+					BidFloor:    2.5,
+					AuctionType: 2,
 				},
 			},
-			Rewarded: 0,
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&Impression{}).Validate()).To(Equal(ErrInvalidImpNoID))
-		Expect((&Impression{ID: "IMPID", Banner: &Banner{}, Video: &Video{}}).Validate()).To(Equal(ErrInvalidImpMultiAssets))
-		Expect((&Impression{ID: "IMPID", Banner: &Banner{}}).Validate()).NotTo(HaveOccurred())
-	})
+		},
+		Quantity: &Quantity{
+			Multiplier: 1.0,
+		},
+		Rewarded: 1,
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-})
+func TestImpression_Validate(t *testing.T) {
+	subject := &Impression{}
+	if exp, got := ErrInvalidImpNoID, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &Impression{ID: "IMPID", Banner: &Banner{}, Video: &Video{}}
+	if exp, got := ErrInvalidImpMultiAssets, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
diff --git a/inventory.go b/inventory.go
index 872b339..f3feba4 100644
--- a/inventory.go
+++ b/inventory.go
@@ -1,5 +1,6 @@
 package openrtb
 
+// Inventory contains inventory specific attributes
 type Inventory struct {
 	ID            string     `json:"id,omitempty"` // ID on the exchange
 	Name          string     `json:"name,omitempty"`
@@ -22,7 +23,7 @@ func (a *Inventory) GetPrivacyPolicy() int {
 	return 1
 }
 
-// An "app" object should be included if the ad supported content is part of a mobile application
+// App object should be included if the ad supported content is part of a mobile application
 // (as opposed to a mobile website).  A bid request must not contain both an "app" object and a
 // "site" object.
 type App struct {
@@ -34,7 +35,7 @@ type App struct {
 	Ext      Extension `json:"ext,omitempty"`      // Placeholder for exchange-specific extensions to OpenRTB
 }
 
-// A site object should be included if the ad supported content is part of a website (as opposed to
+// Site object should be included if the ad supported content is part of a website (as opposed to
 // an application).  A bid request must not contain both a site object and an app object.
 type Site struct {
 	Inventory
diff --git a/inventory_test.go b/inventory_test.go
index 6bce843..dfbfa60 100644
--- a/inventory_test.go
+++ b/inventory_test.go
@@ -1,68 +1,58 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("App", func() {
+func TestApp(t *testing.T) {
 	var subject *App
-
-	BeforeEach(func() {
-		err := fixture("app", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should have accessors", func() {
-		Expect(subject.GetPrivacyPolicy()).To(Equal(1))
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&App{
-			Inventory: Inventory{
-				ID:   "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
-				Name: "Yahoo Weather",
-				Cat:  []string{"weather", "IAB15", "IAB15-10"},
-				Publisher: &Publisher{
-					ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
-					Name:   "yahoo",
-					Domain: "www.yahoo.com",
-				},
+	if err := fixture("app", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	exp := &App{
+		Inventory: Inventory{
+			ID:   "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfIUDA",
+			Name: "Yahoo Weather",
+			Cat:  []string{"weather", string(ContentCategoryScience), string(ContentCategoryWeather)},
+			Publisher: &Publisher{
+				ID:     "agltb3B1Yi1pbmNyDAsSA0FwcBiJkfTUCV",
+				Name:   "yahoo",
+				Domain: "www.yahoo.com",
 			},
-			Bundle:   "628677149",
-			Ver:      "1.0.2",
-			StoreURL: "https://itunes.apple.com/id628677149",
-		}))
-	})
-
-})
-
-var _ = Describe("Site", func() {
+		},
+		Bundle:   "628677149",
+		Ver:      "1.0.2",
+		StoreURL: "https://itunes.apple.com/id628677149",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
+
+func TestSite(t *testing.T) {
 	var subject *Site
-
-	BeforeEach(func() {
-		err := fixture("site", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should have accessors", func() {
-		Expect(subject.GetPrivacyPolicy()).To(Equal(1))
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Site{
-			Inventory: Inventory{
-				ID:     "102855",
-				Cat:    []string{"IAB3-1"},
-				Domain: "http://www.usabarfinder.com",
-				Publisher: &Publisher{
-					ID:     "8953",
-					Name:   "local.com",
-					Domain: "local.com",
-				},
+	if err := fixture("site", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
+
+	exp := &Site{
+		Inventory: Inventory{
+			ID:     "102855",
+			Cat:    []string{string(ContentCategoryAdvertising)},
+			Domain: "http://www.usabarfinder.com",
+			Publisher: &Publisher{
+				ID:     "8953",
+				Name:   "local.com",
+				Domain: "local.com",
 			},
-			Page: "http://eas.usabarfinder.com/eas?cu=13824;cre=mu;target=_blank",
-		}))
-	})
-
-})
+		},
+		Page: "http://eas.usabarfinder.com/eas?cu=13824;cre=mu;target=_blank",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/metric_test.go b/metric_test.go
index ddee7d8..e6d1522 100644
--- a/metric_test.go
+++ b/metric_test.go
@@ -1,24 +1,24 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("Metric", func() {
-	var metric *Metric
+	"reflect"
+	"testing"
 
-	BeforeEach(func() {
-		err := fixture("metric", &metric)
-		Expect(err).NotTo(HaveOccurred())
-	})
+	. "github.com/UnityTech/openrtb"
+)
 
-	It("should parse correctly", func() {
-		Expect(metric).To(Equal(&Metric{
-			Type:   "viewable_percentage",
-			Value:  0.99,
-			Vendor: "MOAT",
-		}))
-	})
+func TestMetric(t *testing.T) {
+	var subject *Metric
+	if err := fixture("metric", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-})
+	exp := &Metric{
+		Type:   "viewable_percentage",
+		Value:  0.99,
+		Vendor: "MOAT",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/native.go b/native.go
index 5d75311..6955055 100644
--- a/native.go
+++ b/native.go
@@ -1,6 +1,6 @@
 package openrtb
 
-// This object represents a native type impression. Native ad units are intended to blend seamlessly into
+// Native object represents a native type impression. Native ad units are intended to blend seamlessly into
 // the surrounding content (e.g., a sponsored Twitter or Facebook post). As such, the response must be
 // well-structured to afford the publisher fine-grained control over rendering.
 // The presence of a Native as a subordinate of the Imp object indicates that this impression is offered as
diff --git a/native/request/asset.go b/native/request/asset.go
index 24bf60b..43024da 100644
--- a/native/request/asset.go
+++ b/native/request/asset.go
@@ -2,7 +2,7 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
-// The main container object for each asset requested or supported by Exchange
+// Asset is the main container object for each asset requested or supported by Exchange
 // on behalf of the rendering client.  Only one of the {title,img,video,data}
 // objects should be present in each object.  The id is to be unique within the
 // AssetObject array so that the response can be aligned.
diff --git a/native/request/data.go b/native/request/data.go
index 5e8fa2a..39e677f 100644
--- a/native/request/data.go
+++ b/native/request/data.go
@@ -2,8 +2,10 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
+// DataTypeID enum.
 type DataTypeID int
 
+// DataTypeID enum values.
 const (
 	DataTypeSponsored      DataTypeID = 1  // Sponsored By message where response should contain the brand name of the sponsor
 	DataTypeDesc           DataTypeID = 2  // Descriptive text associated with the product or service being advertised
@@ -20,6 +22,7 @@ const (
 
 )
 
+// Data is the native data object.
 type Data struct {
 	TypeID DataTypeID        `json:"type"` // Type ID of the element supported by the publisher. The publisher can display this information in an appropriate format
 	Length int               `json:"len"`  // Maximum length of the text in the element’s response
diff --git a/native/request/image.go b/native/request/image.go
index a3a2c4e..dc7de3f 100644
--- a/native/request/image.go
+++ b/native/request/image.go
@@ -2,14 +2,17 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
+// ImageTypeID enum.
 type ImageTypeID int
 
+// ImageTypeID enum values.
 const (
 	ImageTypeIcon ImageTypeID = 1 // Icon image
 	ImageTypeLogo ImageTypeID = 2 // Logo image for the brand/app
 	ImageTypeMain ImageTypeID = 3 // Large image preview for the ad
 )
 
+// Image is the native image object.
 type Image struct {
 	TypeID ImageTypeID `json:"type,omitempty"` // Type ID of the image element supported by the publisher
 
diff --git a/native/request/request.go b/native/request/request.go
index d9a4468..924dfa2 100644
--- a/native/request/request.go
+++ b/native/request/request.go
@@ -2,8 +2,10 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
+// LayoutID enum.
 type LayoutID int
 
+// LayoutID enum values.
 const (
 	LayoutContentWall          LayoutID = 1
 	LayoutAppWall              LayoutID = 2
@@ -14,8 +16,10 @@ const (
 	LayoutGridAdjoiningContent LayoutID = 7
 )
 
+// AdUnitID enum.
 type AdUnitID int
 
+// AdUnitID enum values.
 const (
 	AdUnitPaidSearch            AdUnitID = 1
 	AdUnitRecommendationWidget  AdUnitID = 2
@@ -24,16 +28,20 @@ const (
 	AdUnitCustom                AdUnitID = 5
 )
 
+// ContextTypeID enum.
 type ContextTypeID int
 
+// ContextTypeID enum values.
 const (
 	ContextTypeContent ContextTypeID = 1 // newsfeed, article, image gallery, video gallery
 	ContextTypeSocial  ContextTypeID = 2 // social network feed, email, chat
 	ContextTypeProduct ContextTypeID = 3 // product listings, details, recommendations, reviews
 )
 
+// ContextSubTypeID enum.
 type ContextSubTypeID int
 
+// ContextSubTypeID enum values.
 const (
 	ContextSubTypeGeneral        ContextSubTypeID = 10
 	ContextSubTypeArticle        ContextSubTypeID = 11
@@ -49,8 +57,10 @@ const (
 	ContextSubTypeProductReviews ContextSubTypeID = 32
 )
 
+// PlacementTypeID enum.
 type PlacementTypeID int
 
+// PlacementTypeID enum values.
 const (
 	PlacementTypeInFeed         PlacementTypeID = 1 // In the feed of content - for example as an item inside the organic feed/grid/listing/carousel
 	PlacementTypeAtomic         PlacementTypeID = 2 // In the atomic unit of the content - IE in the article page or single image page
@@ -58,7 +68,7 @@ const (
 	PlacementTypeRecommendation PlacementTypeID = 4 // Recommendation widget, most commonly presented below the article content
 )
 
-// This object represents a native type impression. Native ad units are intended to blend seamlessly into
+// Request object represents a native type impression. Native ad units are intended to blend seamlessly into
 // the surrounding content (e.g., a sponsored Twitter or Facebook post). As such, the response must be
 // well-structured to afford the publisher fine-grained control over rendering.
 // The presence of a Native as a subordinate of the Imp object indicates that this impression is offered as
diff --git a/native/request/request_test.go b/native/request/request_test.go
index fbdd2ad..48f2cd5 100644
--- a/native/request/request_test.go
+++ b/native/request/request_test.go
@@ -1,45 +1,45 @@
-package request
+package request_test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
+	"reflect"
 	"testing"
 
 	"github.com/UnityTech/openrtb"
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/UnityTech/openrtb/native/request"
 )
 
-var _ = Describe("Request", func() {
-	It("should parse correctly", func() {
-		req := fixture("testdata/request1.json")
-		Expect(req).To(Equal(&Request{
-			Ver:              "1.1",
-			ContextTypeID:    ContextTypeSocial,
-			ContextSubTypeID: ContextSubTypeSocial,
-			PlacementTypeID:  PlacementTypeID(11),
-			PlacementCount:   1,
-			Sequence:         2,
-			Assets: []Asset{
-				{ID: 123, Required: 1, Title: &Title{Length: 140}},
-				{ID: 128, Image: &Image{TypeID: ImageTypeMain, WidthMin: 836, HeightMin: 627, Width: 1000, Height: 800, Mimes: []string{"image/jpg"}}},
-				{ID: 126, Required: 1, Data: &Data{TypeID: DataTypeSponsored, Length: 25}},
-				{ID: 127, Required: 1, Data: &Data{TypeID: DataTypeDesc, Length: 140}},
-				{ID: 4, Video: &Video{MinDuration: 15, MaxDuration: 30, Protocols: []int{openrtb.VideoProtoVAST2, openrtb.VideoProtoVAST3}, Mimes: []string{"video/mp4"}}},
-			},
-		}))
-	})
-})
+func TestRequest(t *testing.T) {
+	var subject *Request
+	if err := fixture("testdata/request1.json", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-func TestSuite(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "openrtb/native/request")
+	exp := &Request{
+		Ver:              "1.1",
+		ContextTypeID:    ContextTypeSocial,
+		ContextSubTypeID: ContextSubTypeSocial,
+		PlacementTypeID:  PlacementTypeID(11),
+		PlacementCount:   1,
+		Sequence:         2,
+		Assets: []Asset{
+			{ID: 123, Required: 1, Title: &Title{Length: 140}},
+			{ID: 128, Image: &Image{TypeID: ImageTypeMain, WidthMin: 836, HeightMin: 627, Width: 1000, Height: 800, Mimes: []string{"image/jpg"}}},
+			{ID: 126, Required: 1, Data: &Data{TypeID: DataTypeSponsored, Length: 25}},
+			{ID: 127, Required: 1, Data: &Data{TypeID: DataTypeDesc, Length: 140}},
+			{ID: 4, Video: &Video{MinDuration: 15, MaxDuration: 30, Protocols: []int{openrtb.VideoProtoVAST2, openrtb.VideoProtoVAST3}, Mimes: []string{"video/mp4"}}},
+		},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
 }
 
-func fixture(path string) *Request {
-	var subject Request
-	enc, err := ioutil.ReadFile(path)
-	Expect(err).ToNot(HaveOccurred())
-	Expect(json.Unmarshal(enc, &subject)).To(Succeed())
-	return &subject
+func fixture(path string, v interface{}) error {
+	bin, err := os.ReadFile(path)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(bin, v)
 }
diff --git a/native/request/title.go b/native/request/title.go
index e60669f..48ddb16 100644
--- a/native/request/title.go
+++ b/native/request/title.go
@@ -2,6 +2,7 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
+// Title is the native title object.
 type Title struct {
 	Length int               `json:"len"` // Maximum length of the text in the title element
 	Ext    openrtb.Extension `json:"ext,omitempty"`
diff --git a/native/request/video.go b/native/request/video.go
index 48618eb..9d9edeb 100644
--- a/native/request/video.go
+++ b/native/request/video.go
@@ -2,6 +2,7 @@ package request
 
 import "github.com/UnityTech/openrtb"
 
+// Video is the native video object.
 // TODO unclear if its the same as imp.video https://github.com/openrtb/OpenRTB/issues/26
 type Video struct {
 	Mimes       []string          `json:"mimes,omitempty"`       // Whitelist of content MIME types supported
diff --git a/native/response/asset.go b/native/response/asset.go
index 612bdb6..b1efd2d 100644
--- a/native/response/asset.go
+++ b/native/response/asset.go
@@ -2,7 +2,7 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
-// Corresponds to the Asset Object in the request. The main container object for
+// Asset corresponds to the Asset Object in the request. The main container object for
 // each asset requested or supported by Exchange on behalf of the rendering
 // client. Any object that is required is to be flagged as such. Only one of the
 // {title,img,video,data} objects should be present in each object. All others
diff --git a/native/response/data.go b/native/response/data.go
index 8afe5aa..8736074 100644
--- a/native/response/data.go
+++ b/native/response/data.go
@@ -2,6 +2,7 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
+// Data object contains response data.
 type Data struct {
 	Label string            `json:"label,omitempty"` // The optional formatted string name of the data type to be displayed
 	Value string            `json:"value"`           // The formatted string of data to be displayed. Can contain a formatted value such as “5 stars” or “$10” or “3.4 stars out of 5”
diff --git a/native/response/image.go b/native/response/image.go
index e1b5585..eb49c3b 100644
--- a/native/response/image.go
+++ b/native/response/image.go
@@ -2,6 +2,7 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
+// Image object contains response image.
 type Image struct {
 	URL    string            `json:"url,omitempty"` // URL of the image asset
 	Width  int               `json:"w,omitempty"`   // Width of the image in pixels
diff --git a/native/response/link.go b/native/response/link.go
index 37ba3a4..7abb0f7 100644
--- a/native/response/link.go
+++ b/native/response/link.go
@@ -2,9 +2,10 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
+// Link object contains response link.
 type Link struct {
-	URL           string            `json:"url"`                // Landing URL of the clickable link
-	ClickTrackers []string          `json:"clicktrackers"`      // List of third-party tracker URLs to be fired on click of the URL
-	FallbackURL   string            `json:"fallback,omitempty"` // Fallback URL for deeplink. To be used if the URL given in url is not supported by the device.
+	URL           string            `json:"url"`                     // Landing URL of the clickable link
+	ClickTrackers []string          `json:"clicktrackers,omitempty"` // List of third-party tracker URLs to be fired on click of the URL
+	FallbackURL   string            `json:"fallback,omitempty"`      // Fallback URL for deeplink. To be used if the URL given in url is not supported by the device.
 	Ext           openrtb.Extension `json:"ext,omitempty"`
 }
diff --git a/native/response/response.go b/native/response/response.go
index baaddce..7305815 100644
--- a/native/response/response.go
+++ b/native/response/response.go
@@ -2,7 +2,7 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
-// The native object is the top level JSON object which identifies a native response
+// Response is the native object is the top level JSON object which identifies a native response.
 type Response struct {
 	Ver         openrtb.StringOrNumber `json:"ver,omitempty"`         // Version of the Native Markup
 	Assets      []Asset                `json:"assets"`                // An array of Asset Objects
diff --git a/native/response/response_test.go b/native/response/response_test.go
index 0ba5cf0..6e102ea 100644
--- a/native/response/response_test.go
+++ b/native/response/response_test.go
@@ -1,47 +1,46 @@
-package response
+package response_test
 
 import (
 	"encoding/json"
-	"io/ioutil"
+	"os"
+	"reflect"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/UnityTech/openrtb/native/response"
 )
 
-var _ = Describe("Response", func() {
+func TestResponse(t *testing.T) {
+	var subject *Response
+	if err := fixture("testdata/response1.json", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	It("should parse correctly", func() {
-		Expect(fixture("testdata/response1.json")).To(Equal(Response{
-			Ver:         "1.1",
-			ImpTrackers: []string{"http://imptracker.com"},
-			JSTracker:   "<script>track()</script>",
-			Link: Link{
-				URL: "http://i.am.a/URL",
-			},
-			Assets: []Asset{
-				{ID: 123, Required: 1, Title: &Title{Text: "Learn about this awesome thing"}},
-				{ID: 124, Required: 1, Image: &Image{URL: "http://www.myads.com/thumbnail1.png"}},
-				{ID: 128, Required: 1, Image: &Image{URL: "http://www.myads.com/largethumb1.png"}},
-				{ID: 126, Required: 1, Data: &Data{Value: "My Brand"}},
-				{ID: 127, Required: 1, Data: &Data{Value: "Learn all about this awesome story of someone using my product."}},
-				{ID: 4, Video: &Video{VASTTag: "<VAST version=\"2.0\"></VAST>"}},
-				{ID: 5, Link: &Link{URL: "http://landing.com", ClickTrackers: []string{"http://tracker.com"}, FallbackURL: "http://fallback.com"}},
-			},
-		}))
-	})
-
-})
-
-func TestSuite(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "openrtb/native/response")
+	exp := &Response{
+		Ver:         "1.1",
+		ImpTrackers: []string{"http://imptracker.com"},
+		JSTracker:   "<script>track()</script>",
+		Link: Link{
+			URL: "http://i.am.a/URL",
+		},
+		Assets: []Asset{
+			{ID: 123, Required: 1, Title: &Title{Text: "Learn about this awesome thing"}},
+			{ID: 124, Required: 1, Image: &Image{URL: "http://www.myads.com/thumbnail1.png"}},
+			{ID: 128, Required: 1, Image: &Image{URL: "http://www.myads.com/largethumb1.png"}},
+			{ID: 126, Required: 1, Data: &Data{Value: "My Brand"}},
+			{ID: 127, Required: 1, Data: &Data{Value: "Learn all about this awesome story of someone using my product."}},
+			{ID: 4, Video: &Video{VASTTag: "<VAST version=\"2.0\"></VAST>"}},
+			{ID: 5, Link: &Link{URL: "http://landing.com", ClickTrackers: []string{"http://tracker.com"}, FallbackURL: "http://fallback.com"}},
+		},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
 }
 
-func fixture(path string) Response {
-	var subject Response
-	enc, err := ioutil.ReadFile(path)
-	Expect(err).ToNot(HaveOccurred())
-	Expect(json.Unmarshal(enc, &subject)).To(Succeed())
-	return subject
+func fixture(path string, v interface{}) error {
+	bin, err := os.ReadFile(path)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(bin, v)
 }
diff --git a/native/response/title.go b/native/response/title.go
index e3121f7..873aaf7 100644
--- a/native/response/title.go
+++ b/native/response/title.go
@@ -2,6 +2,7 @@ package response
 
 import "github.com/UnityTech/openrtb"
 
+// Title wraps title information.
 type Title struct {
 	Text string            `json:"text"` // The text associated with the text element
 	Ext  openrtb.Extension `json:"ext,omitempty"`
diff --git a/native/response/video.go b/native/response/video.go
index 0209389..50ee6ad 100644
--- a/native/response/video.go
+++ b/native/response/video.go
@@ -1,5 +1,6 @@
 package response
 
+// Video is the VAST wrapper object.
 type Video struct {
 	VASTTag string `json:"vasttag"` // VAST XML
 }
diff --git a/native_test.go b/native_test.go
index 58cb232..fe9e2b1 100644
--- a/native_test.go
+++ b/native_test.go
@@ -1,23 +1,23 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Native", func() {
+func TestNative(t *testing.T) {
 	var subject *Native
+	if err := fixture("native", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("native", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Native{
-			Request: Extension(`"PAYLOAD"`),
-			Ver:     "2",
-		}))
-	})
-
-})
+	exp := &Native{
+		Request: Extension(`"PAYLOAD"`),
+		Ver:     "2",
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/numbers_test.go b/numbers_test.go
index c3a7c0e..9079a07 100644
--- a/numbers_test.go
+++ b/numbers_test.go
@@ -1,60 +1,46 @@
-package openrtb
+package openrtb_test
 
 import (
 	"encoding/json"
+	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("NumberOrString", func() {
-
-	It("should decode numbers", func() {
-		var n NumberOrString
-		Expect(json.Unmarshal([]byte(`33`), &n)).To(Succeed())
-		Expect(n).To(Equal(NumberOrString(33)))
-	})
-
-	It("should decode strings", func() {
-		var n NumberOrString
-		Expect(json.Unmarshal([]byte(`"33"`), &n)).To(Succeed())
-		Expect(n).To(Equal(NumberOrString(33)))
-	})
-
-	It("should encode to numbers", func() {
-		var n NumberOrString = 33
-		bin, err := json.Marshal(n)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(string(bin)).To(Equal(`33`))
-	})
-
-})
-
-var _ = Describe("StringOrNumber", func() {
-
-	It("should decode numbers", func() {
-		var n StringOrNumber
-		Expect(json.Unmarshal([]byte(`33`), &n)).To(Succeed())
-		Expect(n).To(Equal(StringOrNumber("33")))
-	})
-
-	It("should decode strings", func() {
-		var n StringOrNumber
-		Expect(json.Unmarshal([]byte(`"33"`), &n)).To(Succeed())
-		Expect(n).To(Equal(StringOrNumber("33")))
-	})
-
-	It("should encode to strings", func() {
-		var n StringOrNumber = "33"
-		bin, err := json.Marshal(n)
-		Expect(err).NotTo(HaveOccurred())
-		Expect(string(bin)).To(Equal(`"33"`))
-	})
-
-	It("should decode empty strings", func() {
-		var n StringOrNumber
-		Expect(json.Unmarshal([]byte(`""`), &n)).To(Succeed())
-		Expect(n).To(Equal(StringOrNumber("")))
-	})
-
-})
+func TestNumberOrString(t *testing.T) {
+	var v NumberOrString
+
+	if err := json.Unmarshal([]byte(`33`), &v); err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else if exp := NumberOrString(33); exp != v {
+		t.Errorf("expected %#v, got %#v", exp, v)
+	}
+
+	if err := json.Unmarshal([]byte(`"34"`), &v); err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else if exp := NumberOrString(34); exp != v {
+		t.Errorf("expected %#v, got %#v", exp, v)
+	}
+}
+
+func TestStringOrNumber(t *testing.T) {
+	var v StringOrNumber
+
+	if err := json.Unmarshal([]byte(`33`), &v); err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else if exp := StringOrNumber("33"); exp != v {
+		t.Errorf("expected %#v, got %#v", exp, v)
+	}
+
+	if err := json.Unmarshal([]byte(`"34"`), &v); err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else if exp := StringOrNumber("34"); exp != v {
+		t.Errorf("expected %#v, got %#v", exp, v)
+	}
+
+	if err := json.Unmarshal([]byte(`""`), &v); err != nil {
+		t.Errorf("expected no error, got %v", err)
+	} else if exp := StringOrNumber(""); exp != v {
+		t.Errorf("expected %#v, got %#v", exp, v)
+	}
+}
diff --git a/openrtb.go b/openrtb.go
index 9ffb52b..b529185 100644
--- a/openrtb.go
+++ b/openrtb.go
@@ -1,5 +1,429 @@
 package openrtb
 
+// ContentCategory as defined in section 5.1
+type ContentCategory string
+
+// ContentCategory values.
+const (
+	ContentCategoryArtsEntertainment  ContentCategory = "IAB1"
+	ContentCategoryBooksLiterature    ContentCategory = "IAB1-1"
+	ContentCategoryCelebrityFanGossip ContentCategory = "IAB1-2"
+	ContentCategoryFineArt            ContentCategory = "IAB1-3"
+	ContentCategoryHumor              ContentCategory = "IAB1-4"
+	ContentCategoryMovies             ContentCategory = "IAB1-5"
+	ContentCategoryMusic              ContentCategory = "IAB1-6"
+	ContentCategoryTelevision         ContentCategory = "IAB1-7"
+
+	ContentCategoryAutomotive          ContentCategory = "IAB2"
+	ContentCategoryAutoParts           ContentCategory = "IAB2-1"
+	ContentCategoryAutoRepair          ContentCategory = "IAB2-2"
+	ContentCategoryBuyingSellingCars   ContentCategory = "IAB2-3"
+	ContentCategoryCarCulture          ContentCategory = "IAB2-4"
+	ContentCategoryCertifiedPreOwned   ContentCategory = "IAB2-5"
+	ContentCategoryConvertible         ContentCategory = "IAB2-6"
+	ContentCategoryCoupe               ContentCategory = "IAB2-7"
+	ContentCategoryCrossover           ContentCategory = "IAB2-8"
+	ContentCategoryDiesel              ContentCategory = "IAB2-9"
+	ContentCategoryElectricVehicle     ContentCategory = "IAB2-10"
+	ContentCategoryHatchback           ContentCategory = "IAB2-11"
+	ContentCategoryHybrid              ContentCategory = "IAB2-12"
+	ContentCategoryLuxury              ContentCategory = "IAB2-13"
+	ContentCategoryMiniVan             ContentCategory = "IAB2-14"
+	ContentCategoryMororcycles         ContentCategory = "IAB2-15"
+	ContentCategoryOffRoadVehicles     ContentCategory = "IAB2-16"
+	ContentCategoryPerformanceVehicles ContentCategory = "IAB2-17"
+	ContentCategoryPickup              ContentCategory = "IAB2-18"
+	ContentCategoryRoadSideAssistance  ContentCategory = "IAB2-19"
+	ContentCategorySedan               ContentCategory = "IAB2-20"
+	ContentCategoryTrucksAccessories   ContentCategory = "IAB2-21"
+	ContentCategoryVintageCars         ContentCategory = "IAB2-22"
+	ContentCategoryWagon               ContentCategory = "IAB2-23"
+
+	ContentCategoryBusiness          ContentCategory = "IAB3"
+	ContentCategoryAdvertising       ContentCategory = "IAB3-1"
+	ContentCategoryAgriculture       ContentCategory = "IAB3-2"
+	ContentCategoryBiotechBiomedical ContentCategory = "IAB3-3"
+	ContentCategoryBusinessSoftware  ContentCategory = "IAB3-4"
+	ContentCategoryConstruction      ContentCategory = "IAB3-5"
+	ContentCategoryForestry          ContentCategory = "IAB3-6"
+	ContentCategoryGovernment        ContentCategory = "IAB3-7"
+	ContentCategoryGreenSolutions    ContentCategory = "IAB3-8"
+	ContentCategoryHumanResources    ContentCategory = "IAB3-9"
+	ContentCategoryLogistics         ContentCategory = "IAB3-10"
+	ContentCategoryMarketing         ContentCategory = "IAB3-11"
+	ContentCategoryMetals            ContentCategory = "IAB3-12"
+
+	ContentCategoryCareers             ContentCategory = "IAB4"
+	ContentCategoryCareerPlanning      ContentCategory = "IAB4-1"
+	ContentCategoryCollege             ContentCategory = "IAB4-2"
+	ContentCategoryFinancialAid        ContentCategory = "IAB4-3"
+	ContentCategoryJobFairs            ContentCategory = "IAB4-4"
+	ContentCategoryJobSearch           ContentCategory = "IAB4-5"
+	ContentCategoryResumeWritingAdvice ContentCategory = "IAB4-6"
+	ContentCategoryNursing             ContentCategory = "IAB4-7"
+	ContentCategoryScholarships        ContentCategory = "IAB4-8"
+	ContentCategoryTelecommuting       ContentCategory = "IAB4-9"
+	ContentCategoryUSMilitary          ContentCategory = "IAB4-10"
+	ContentCategoryCareerAdvice        ContentCategory = "IAB4-11"
+
+	ContentCategoryEducation             ContentCategory = "IAB5"
+	ContentCategory12Education           ContentCategory = "IAB5-1"
+	ContentCategoryAdultEducation        ContentCategory = "IAB5-2"
+	ContentCategoryArtHistory            ContentCategory = "IAB5-3"
+	ContentCategoryCollegeAdministration ContentCategory = "IAB5-4"
+	ContentCategoryCollegeLife           ContentCategory = "IAB5-5"
+	ContentCategoryDistanceLearning      ContentCategory = "IAB5-6"
+	ContentCategoryEnglishasa2ndLanguage ContentCategory = "IAB5-7"
+	ContentCategoryLanguageLearning      ContentCategory = "IAB5-8"
+	ContentCategoryGraduateSchool        ContentCategory = "IAB5-9"
+	ContentCategoryHomeschooling         ContentCategory = "IAB5-10"
+	ContentCategoryHomeworkStudyTips     ContentCategory = "IAB5-11"
+	ContentCategoryK6Educators           ContentCategory = "IAB5-12"
+	ContentCategoryPrivateSchool         ContentCategory = "IAB5-13"
+	ContentCategorySpecialEducation      ContentCategory = "IAB5-14"
+	ContentCategoryStudyingBusiness      ContentCategory = "IAB5-15"
+
+	ContentCategoryFamilyParenting  ContentCategory = "IAB6"
+	ContentCategoryAdoption         ContentCategory = "IAB6-1"
+	ContentCategoryBabiesToddlers   ContentCategory = "IAB6-2"
+	ContentCategoryDaycarePreSchool ContentCategory = "IAB6-3"
+	ContentCategoryFamilyInternet   ContentCategory = "IAB6-4"
+	ContentCategoryParentingK6Kids  ContentCategory = "IAB6-5"
+	ContentCategoryParentingteens   ContentCategory = "IAB6-6"
+	ContentCategoryPregnancy        ContentCategory = "IAB6-7"
+	ContentCategorySpecialNeedsKids ContentCategory = "IAB6-8"
+	ContentCategoryEldercare        ContentCategory = "IAB6-9"
+
+	ContentCategoryHealthFitness          ContentCategory = "IAB7"
+	ContentCategoryExercise               ContentCategory = "IAB7-1"
+	ContentCategoryADD                    ContentCategory = "IAB7-2"
+	ContentCategoryAIDSHIV                ContentCategory = "IAB7-3"
+	ContentCategoryAllergies              ContentCategory = "IAB7-4"
+	ContentCategoryAlternativeMedicine    ContentCategory = "IAB7-5"
+	ContentCategoryArthritis              ContentCategory = "IAB7-6"
+	ContentCategoryAsthma                 ContentCategory = "IAB7-7"
+	ContentCategoryAutismPDD              ContentCategory = "IAB7-8"
+	ContentCategoryBipolarDisorder        ContentCategory = "IAB7-9"
+	ContentCategoryBrainTumor             ContentCategory = "IAB7-10"
+	ContentCategoryCancer                 ContentCategory = "IAB7-11"
+	ContentCategoryCholesterol            ContentCategory = "IAB7-12"
+	ContentCategoryChronicFatigueSyndrome ContentCategory = "IAB7-13"
+	ContentCategoryChronicPain            ContentCategory = "IAB7-14"
+	ContentCategoryColdFlu                ContentCategory = "IAB7-15"
+	ContentCategoryDeafness               ContentCategory = "IAB7-16"
+	ContentCategoryDentalCare             ContentCategory = "IAB7-17"
+	ContentCategoryDepression             ContentCategory = "IAB7-18"
+	ContentCategoryDermatology            ContentCategory = "IAB7-19"
+	ContentCategoryDiabetes               ContentCategory = "IAB7-20"
+	ContentCategoryEpilepsy               ContentCategory = "IAB7-21"
+	ContentCategoryGERDAcidReflux         ContentCategory = "IAB7-22"
+	ContentCategoryHeadachesMigraines     ContentCategory = "IAB7-23"
+	ContentCategoryHeartDisease           ContentCategory = "IAB7-24"
+	ContentCategoryHerbsforHealth         ContentCategory = "IAB7-25"
+	ContentCategoryHolisticHealing        ContentCategory = "IAB7-26"
+	ContentCategoryIBSCrohnsDisease       ContentCategory = "IAB7-27"
+	ContentCategoryIncestAbuseSupport     ContentCategory = "IAB7-28"
+	ContentCategoryIncontinence           ContentCategory = "IAB7-29"
+	ContentCategoryInfertility            ContentCategory = "IAB7-30"
+	ContentCategoryMensHealth             ContentCategory = "IAB7-31"
+	ContentCategoryNutrition              ContentCategory = "IAB7-32"
+	ContentCategoryOrthopedics            ContentCategory = "IAB7-33"
+	ContentCategoryPanicAnxietyDisorders  ContentCategory = "IAB7-34"
+	ContentCategoryPediatrics             ContentCategory = "IAB7-35"
+	ContentCategoryPhysicalTherapy        ContentCategory = "IAB7-36"
+	ContentCategoryPsychologyPsychiatry   ContentCategory = "IAB7-37"
+	ContentCategorySeniorHealth           ContentCategory = "IAB7-38"
+	ContentCategorySexuality              ContentCategory = "IAB7-39"
+	ContentCategorySleepDisorders         ContentCategory = "IAB7-40"
+	ContentCategorySmokingCessation       ContentCategory = "IAB7-41"
+	ContentCategorySubstanceAbuse         ContentCategory = "IAB7-42"
+	ContentCategoryThyroidDisease         ContentCategory = "IAB7-43"
+	ContentCategoryWeightLoss             ContentCategory = "IAB7-44"
+	ContentCategoryWomensHealth           ContentCategory = "IAB7-45"
+
+	ContentCategoryFoodDrink           ContentCategory = "IAB8"
+	ContentCategoryAmericanCuisine     ContentCategory = "IAB8-1"
+	ContentCategoryBarbecuesGrilling   ContentCategory = "IAB8-2"
+	ContentCategoryCajunCreole         ContentCategory = "IAB8-3"
+	ContentCategoryChineseCuisine      ContentCategory = "IAB8-4"
+	ContentCategoryCocktailsBeer       ContentCategory = "IAB8-5"
+	ContentCategoryCoffeeTea           ContentCategory = "IAB8-6"
+	ContentCategoryCuisineSpecific     ContentCategory = "IAB8-7"
+	ContentCategoryDessertsBaking      ContentCategory = "IAB8-8"
+	ContentCategoryDiningOut           ContentCategory = "IAB8-9"
+	ContentCategoryFoodAllergies       ContentCategory = "IAB8-10"
+	ContentCategoryFrenchCuisine       ContentCategory = "IAB8-11"
+	ContentCategoryHealthLowfatCooking ContentCategory = "IAB8-12"
+	ContentCategoryItalianCuisine      ContentCategory = "IAB8-13"
+	ContentCategoryJapaneseCuisine     ContentCategory = "IAB8-14"
+	ContentCategoryMexicanCuisine      ContentCategory = "IAB8-15"
+	ContentCategoryVegan               ContentCategory = "IAB8-16"
+	ContentCategoryVegetarian          ContentCategory = "IAB8-17"
+	ContentCategoryWine                ContentCategory = "IAB8-18"
+
+	ContentCategoryHobbiesInterests   ContentCategory = "IAB9"
+	ContentCategoryArtTechnology      ContentCategory = "IAB9-1"
+	ContentCategoryArtsCrafts         ContentCategory = "IAB9-2"
+	ContentCategoryBeadwork           ContentCategory = "IAB9-3"
+	ContentCategoryBirdwatching       ContentCategory = "IAB9-4"
+	ContentCategoryBoardGamesPuzzles  ContentCategory = "IAB9-5"
+	ContentCategoryCandleSoapMaking   ContentCategory = "IAB9-6"
+	ContentCategoryCardGames          ContentCategory = "IAB9-7"
+	ContentCategoryChess              ContentCategory = "IAB9-8"
+	ContentCategoryCigars             ContentCategory = "IAB9-9"
+	ContentCategoryCollecting         ContentCategory = "IAB9-10"
+	ContentCategoryComicBooks         ContentCategory = "IAB9-11"
+	ContentCategoryDrawingSketching   ContentCategory = "IAB9-12"
+	ContentCategoryFreelanceWriting   ContentCategory = "IAB9-13"
+	ContentCategoryGenealogy          ContentCategory = "IAB9-14"
+	ContentCategoryGettingPublished   ContentCategory = "IAB9-15"
+	ContentCategoryGuitar             ContentCategory = "IAB9-16"
+	ContentCategoryHomeRecording      ContentCategory = "IAB9-17"
+	ContentCategoryInvestorsPatents   ContentCategory = "IAB9-18"
+	ContentCategoryJewelryMaking      ContentCategory = "IAB9-19"
+	ContentCategoryMagicIllusion      ContentCategory = "IAB9-20"
+	ContentCategoryNeedlework         ContentCategory = "IAB9-21"
+	ContentCategoryPainting           ContentCategory = "IAB9-22"
+	ContentCategoryPhotography        ContentCategory = "IAB9-23"
+	ContentCategoryRadio              ContentCategory = "IAB9-24"
+	ContentCategoryRoleplayingGames   ContentCategory = "IAB9-25"
+	ContentCategorySciFiFantasy       ContentCategory = "IAB9-26"
+	ContentCategoryScrapbooking       ContentCategory = "IAB9-27"
+	ContentCategoryScreenwriting      ContentCategory = "IAB9-28"
+	ContentCategoryStampsCoins        ContentCategory = "IAB9-29"
+	ContentCategoryVideoComputerGames ContentCategory = "IAB9-30"
+	ContentCategoryWoodworking        ContentCategory = "IAB9-31"
+
+	ContentCategoryHomeGarden             ContentCategory = "IAB10"
+	ContentCategoryAppliances             ContentCategory = "IAB10-1"
+	ContentCategoryEntertaining           ContentCategory = "IAB10-2"
+	ContentCategoryEnvironmentalSafety    ContentCategory = "IAB10-3"
+	ContentCategoryGardening              ContentCategory = "IAB10-4"
+	ContentCategoryHomeRepair             ContentCategory = "IAB10-5"
+	ContentCategoryHomeTheater            ContentCategory = "IAB10-6"
+	ContentCategoryInteriorDecorating     ContentCategory = "IAB10-7"
+	ContentCategoryLandscaping            ContentCategory = "IAB10-8"
+	ContentCategoryRemodelingConstruction ContentCategory = "IAB10-9"
+
+	ContentCategoryLawGovtPolitics       ContentCategory = "IAB11"
+	ContentCategoryImmigration           ContentCategory = "IAB11-1"
+	ContentCategoryLegalIssues           ContentCategory = "IAB11-2"
+	ContentCategoryUSGovernmentResources ContentCategory = "IAB11-3"
+	ContentCategoryPolitics              ContentCategory = "IAB11-4"
+	ContentCategoryCommentary            ContentCategory = "IAB11-5"
+
+	ContentCategoryNews              ContentCategory = "IAB12"
+	ContentCategoryInternationalNews ContentCategory = "IAB12-1"
+	ContentCategoryNationalNews      ContentCategory = "IAB12-2"
+	ContentCategoryLocalNews         ContentCategory = "IAB12-3"
+
+	ContentCategoryPersonalFinance    ContentCategory = "IAB13"
+	ContentCategoryBeginningInvesting ContentCategory = "IAB13-1"
+	ContentCategoryCreditDebtLoans    ContentCategory = "IAB13-2"
+	ContentCategoryFinancialNews      ContentCategory = "IAB13-3"
+	ContentCategoryFinancialPlanning  ContentCategory = "IAB13-4"
+	ContentCategoryHedgeFund          ContentCategory = "IAB13-5"
+	ContentCategoryInsurance          ContentCategory = "IAB13-6"
+	ContentCategoryInvesting          ContentCategory = "IAB13-7"
+	ContentCategoryMutualFunds        ContentCategory = "IAB13-8"
+	ContentCategoryOptions            ContentCategory = "IAB13-9"
+	ContentCategoryRetirementPlanning ContentCategory = "IAB13-10"
+	ContentCategoryStocks             ContentCategory = "IAB13-11"
+	ContentCategoryTaxPlanning        ContentCategory = "IAB13-12"
+
+	ContentCategorySociety        ContentCategory = "IAB14"
+	ContentCategoryDating         ContentCategory = "IAB14-1"
+	ContentCategoryDivorceSupport ContentCategory = "IAB14-2"
+	ContentCategoryGayLife        ContentCategory = "IAB14-3"
+	ContentCategoryMarriage       ContentCategory = "IAB14-4"
+	ContentCategorySeniorLiving   ContentCategory = "IAB14-5"
+	ContentCategoryTeens          ContentCategory = "IAB14-6"
+	ContentCategoryWeddings       ContentCategory = "IAB14-7"
+	ContentCategoryEthnicSpecific ContentCategory = "IAB14-8"
+
+	ContentCategoryScience             ContentCategory = "IAB15"
+	ContentCategoryAstrology           ContentCategory = "IAB15-1"
+	ContentCategoryBiology             ContentCategory = "IAB15-2"
+	ContentCategoryChemistry           ContentCategory = "IAB15-3"
+	ContentCategoryGeology             ContentCategory = "IAB15-4"
+	ContentCategoryParanormalPhenomena ContentCategory = "IAB15-5"
+	ContentCategoryPhysics             ContentCategory = "IAB15-6"
+	ContentCategorySpaceAstronomy      ContentCategory = "IAB15-7"
+	ContentCategoryGeography           ContentCategory = "IAB15-8"
+	ContentCategoryBotany              ContentCategory = "IAB15-9"
+	ContentCategoryWeather             ContentCategory = "IAB15-10"
+
+	ContentCategoryPets               ContentCategory = "IAB16"
+	ContentCategoryAquariums          ContentCategory = "IAB16-1"
+	ContentCategoryBirds              ContentCategory = "IAB16-2"
+	ContentCategoryCats               ContentCategory = "IAB16-3"
+	ContentCategoryDogs               ContentCategory = "IAB16-4"
+	ContentCategoryLargeAnimals       ContentCategory = "IAB16-5"
+	ContentCategoryReptiles           ContentCategory = "IAB16-6"
+	ContentCategoryVeterinaryMedicine ContentCategory = "IAB16-7"
+
+	ContentCategorySports              ContentCategory = "IAB17"
+	ContentCategoryAutoRacing          ContentCategory = "IAB17-1"
+	ContentCategoryBaseball            ContentCategory = "IAB17-2"
+	ContentCategoryBicycling           ContentCategory = "IAB17-3"
+	ContentCategoryBodybuilding        ContentCategory = "IAB17-4"
+	ContentCategoryBoxing              ContentCategory = "IAB17-5"
+	ContentCategoryCanoeingKayaking    ContentCategory = "IAB17-6"
+	ContentCategoryCheerleading        ContentCategory = "IAB17-7"
+	ContentCategoryClimbing            ContentCategory = "IAB17-8"
+	ContentCategoryCricket             ContentCategory = "IAB17-9"
+	ContentCategoryFigureSkating       ContentCategory = "IAB17-10"
+	ContentCategoryFlyFishing          ContentCategory = "IAB17-11"
+	ContentCategoryFootball            ContentCategory = "IAB17-12"
+	ContentCategoryFreshwaterFishing   ContentCategory = "IAB17-13"
+	ContentCategoryGameFish            ContentCategory = "IAB17-14"
+	ContentCategoryGolf                ContentCategory = "IAB17-15"
+	ContentCategoryHorseRacing         ContentCategory = "IAB17-16"
+	ContentCategoryHorses              ContentCategory = "IAB17-17"
+	ContentCategoryHuntingShooting     ContentCategory = "IAB17-18"
+	ContentCategoryInlineSkating       ContentCategory = "IAB17-19"
+	ContentCategoryMartialArts         ContentCategory = "IAB17-20"
+	ContentCategoryMountainBiking      ContentCategory = "IAB17-21"
+	ContentCategoryNASCARRacing        ContentCategory = "IAB17-22"
+	ContentCategoryOlympics            ContentCategory = "IAB17-23"
+	ContentCategoryPaintball           ContentCategory = "IAB17-24"
+	ContentCategoryPowerMotorcycles    ContentCategory = "IAB17-25"
+	ContentCategoryProBasketball       ContentCategory = "IAB17-26"
+	ContentCategoryProIceHockey        ContentCategory = "IAB17-27"
+	ContentCategoryRodeo               ContentCategory = "IAB17-28"
+	ContentCategoryRugby               ContentCategory = "IAB17-29"
+	ContentCategoryRunningJogging      ContentCategory = "IAB17-30"
+	ContentCategorySailing             ContentCategory = "IAB17-31"
+	ContentCategorySaltwaterFishing    ContentCategory = "IAB17-32"
+	ContentCategoryScubaDiving         ContentCategory = "IAB17-33"
+	ContentCategorySkateboarding       ContentCategory = "IAB17-34"
+	ContentCategorySkiing              ContentCategory = "IAB17-35"
+	ContentCategorySnowboarding        ContentCategory = "IAB17-36"
+	ContentCategorySurfingBodyboarding ContentCategory = "IAB17-37"
+	ContentCategorySwimming            ContentCategory = "IAB17-38"
+	ContentCategoryTableTennisPingPong ContentCategory = "IAB17-39"
+	ContentCategoryTennis              ContentCategory = "IAB17-40"
+	ContentCategoryVolleyball          ContentCategory = "IAB17-41"
+	ContentCategoryWalking             ContentCategory = "IAB17-42"
+	ContentCategoryWaterskiWakeboard   ContentCategory = "IAB17-43"
+	ContentCategoryWorldSoccer         ContentCategory = "IAB17-44"
+
+	ContentCategoryStyleFashion ContentCategory = "IAB18"
+	ContentCategoryBeauty       ContentCategory = "IAB18-1"
+	ContentCategoryBodyArt      ContentCategory = "IAB18-2"
+	ContentCategoryFashion      ContentCategory = "IAB18-3"
+	ContentCategoryJewelry      ContentCategory = "IAB18-4"
+	ContentCategoryClothing     ContentCategory = "IAB18-5"
+	ContentCategoryAccessories  ContentCategory = "IAB18-6"
+
+	ContentCategoryTechnologyComputing   ContentCategory = "IAB19"
+	ContentCategoryDGraphics             ContentCategory = "IAB19-1"
+	ContentCategoryAnimation             ContentCategory = "IAB19-2"
+	ContentCategoryAntivirusSoftware     ContentCategory = "IAB19-3"
+	ContentCategoryCC                    ContentCategory = "IAB19-4"
+	ContentCategoryCamerasCamcorders     ContentCategory = "IAB19-5"
+	ContentCategoryCellPhones            ContentCategory = "IAB19-6"
+	ContentCategoryComputerCertification ContentCategory = "IAB19-7"
+	ContentCategoryComputerNetworking    ContentCategory = "IAB19-8"
+	ContentCategoryComputerPeripherals   ContentCategory = "IAB19-9"
+	ContentCategoryComputerReviews       ContentCategory = "IAB19-10"
+	ContentCategoryDataCenters           ContentCategory = "IAB19-11"
+	ContentCategoryDatabases             ContentCategory = "IAB19-12"
+	ContentCategoryDesktopPublishing     ContentCategory = "IAB19-13"
+	ContentCategoryDesktopVideo          ContentCategory = "IAB19-14"
+	ContentCategoryEmail                 ContentCategory = "IAB19-15"
+	ContentCategoryGraphicsSoftware      ContentCategory = "IAB19-16"
+	ContentCategoryHomeVideoDVD          ContentCategory = "IAB19-17"
+	ContentCategoryInternetTechnology    ContentCategory = "IAB19-18"
+	ContentCategoryJava                  ContentCategory = "IAB19-19"
+	ContentCategoryJavaScript            ContentCategory = "IAB19-20"
+	ContentCategoryMacSupport            ContentCategory = "IAB19-21"
+	ContentCategoryMP3MIDI               ContentCategory = "IAB19-22"
+	ContentCategoryNetConferencing       ContentCategory = "IAB19-23"
+	ContentCategoryNetforBeginners       ContentCategory = "IAB19-24"
+	ContentCategoryNetworkSecurity       ContentCategory = "IAB19-25"
+	ContentCategoryPalmtopsPDAs          ContentCategory = "IAB19-26"
+	ContentCategoryPCSupport             ContentCategory = "IAB19-27"
+	ContentCategoryPortable              ContentCategory = "IAB19-28"
+	ContentCategoryEntertainment         ContentCategory = "IAB19-29"
+	ContentCategorySharewareFreeware     ContentCategory = "IAB19-30"
+	ContentCategoryUnix                  ContentCategory = "IAB19-31"
+	ContentCategoryVisualBasic           ContentCategory = "IAB19-32"
+	ContentCategoryWebClipArt            ContentCategory = "IAB19-33"
+	ContentCategoryWebDesignHTML         ContentCategory = "IAB19-34"
+	ContentCategoryWebSearch             ContentCategory = "IAB19-35"
+	ContentCategoryWindows               ContentCategory = "IAB19-36"
+
+	ContentCategoryTravel               ContentCategory = "IAB20"
+	ContentCategoryAdventureTravel      ContentCategory = "IAB20-1"
+	ContentCategoryAfrica               ContentCategory = "IAB20-2"
+	ContentCategoryAirTravel            ContentCategory = "IAB20-3"
+	ContentCategoryAustraliaNewZealand  ContentCategory = "IAB20-4"
+	ContentCategoryBedBreakfasts        ContentCategory = "IAB20-5"
+	ContentCategoryBudgetTravel         ContentCategory = "IAB20-6"
+	ContentCategoryBusinessTravel       ContentCategory = "IAB20-7"
+	ContentCategoryByUSLocale           ContentCategory = "IAB20-8"
+	ContentCategoryCamping              ContentCategory = "IAB20-9"
+	ContentCategoryCanada               ContentCategory = "IAB20-10"
+	ContentCategoryCaribbean            ContentCategory = "IAB20-11"
+	ContentCategoryCruises              ContentCategory = "IAB20-12"
+	ContentCategoryEasternEurope        ContentCategory = "IAB20-13"
+	ContentCategoryEurope               ContentCategory = "IAB20-14"
+	ContentCategoryFrance               ContentCategory = "IAB20-15"
+	ContentCategoryGreece               ContentCategory = "IAB20-16"
+	ContentCategoryHoneymoonsGetaways   ContentCategory = "IAB20-17"
+	ContentCategoryHotels               ContentCategory = "IAB20-18"
+	ContentCategoryItaly                ContentCategory = "IAB20-19"
+	ContentCategoryJapan                ContentCategory = "IAB20-20"
+	ContentCategoryMexicoCentralAmerica ContentCategory = "IAB20-21"
+	ContentCategoryNationalParks        ContentCategory = "IAB20-22"
+	ContentCategorySouthAmerica         ContentCategory = "IAB20-23"
+	ContentCategorySpas                 ContentCategory = "IAB20-24"
+	ContentCategoryThemeParks           ContentCategory = "IAB20-25"
+	ContentCategoryTravelingwithKids    ContentCategory = "IAB20-26"
+	ContentCategoryUnitedKingdom        ContentCategory = "IAB20-27"
+
+	ContentCategoryRealEstate         ContentCategory = "IAB21"
+	ContentCategoryApartments         ContentCategory = "IAB21-1"
+	ContentCategoryArchitects         ContentCategory = "IAB21-2"
+	ContentCategoryBuyingSellingHomes ContentCategory = "IAB21-3"
+
+	ContentCategoryShopping         ContentCategory = "IAB22"
+	ContentCategoryContestsFreebies ContentCategory = "IAB22-1"
+	ContentCategoryCouponing        ContentCategory = "IAB22-2"
+	ContentCategoryComparison       ContentCategory = "IAB22-3"
+	ContentCategoryEngines          ContentCategory = "IAB22-4"
+
+	ContentCategoryReligionSpirituality ContentCategory = "IAB23"
+	ContentCategoryAlternativeReligions ContentCategory = "IAB23-1"
+	ContentCategoryAtheismAgnosticism   ContentCategory = "IAB23-2"
+	ContentCategoryBuddhism             ContentCategory = "IAB23-3"
+	ContentCategoryCatholicism          ContentCategory = "IAB23-4"
+	ContentCategoryChristianity         ContentCategory = "IAB23-5"
+	ContentCategoryHinduism             ContentCategory = "IAB23-6"
+	ContentCategoryIslam                ContentCategory = "IAB23-7"
+	ContentCategoryJudaism              ContentCategory = "IAB23-8"
+	ContentCategoryLatterDaySaints      ContentCategory = "IAB23-9"
+	ContentCategoryPaganWiccan          ContentCategory = "IAB23-10"
+
+	ContentCategoryUncategorized ContentCategory = "IAB24"
+
+	ContentCategoryNonStandardContent             ContentCategory = "IAB25"
+	ContentCategoryUnmoderatedUGC                 ContentCategory = "IAB25-1"
+	ContentCategoryExtremeGraphicExplicitViolence ContentCategory = "IAB25-2"
+	ContentCategoryPornography                    ContentCategory = "IAB25-3"
+	ContentCategoryProfaneContent                 ContentCategory = "IAB25-4"
+	ContentCategoryHateContent                    ContentCategory = "IAB25-5"
+	ContentCategoryUnderConstruction              ContentCategory = "IAB25-6"
+	ContentCategoryIncentivized                   ContentCategory = "IAB25-7"
+
+	ContentCategoryAnyIllegalContent     ContentCategory = "IAB26"
+	ContentCategoryIllegalContent        ContentCategory = "IAB26-1"
+	ContentCategoryWarez                 ContentCategory = "IAB26-2"
+	ContentCategorySpywareMalware        ContentCategory = "IAB26-3"
+	ContentCategoryCopyrightInfringement ContentCategory = "IAB26-4"
+)
+
 // 5.2 Banner Ad Types
 const (
 	BannerTypeXHTMLText = 1
@@ -42,6 +466,7 @@ const (
 
 // 5.5 Expandable Direction
 const (
+	ExpDirUnknown    = 0
 	ExpDirLeft       = 1
 	ExpDirRight      = 2
 	ExpDirUp         = 3
@@ -51,23 +476,28 @@ const (
 
 // 5.6 API Frameworks
 const (
-	APIFrameworkVPAID1 = 1
-	APIFrameworkVPAID2 = 2
-	APIFrameworkMRAID1 = 3
-	APIFrameworkORMMA  = 4
-	APIFrameworkMRAID2 = 5
-	APIFrameworkMRAID3 = 6
-	APIFrameworkOMID1  = 7
+	APIFrameworkUnknown = 0
+	APIFrameworkVPAID1  = 1
+	APIFrameworkVPAID2  = 2
+	APIFrameworkMRAID1  = 3
+	APIFrameworkORMMA   = 4
+	APIFrameworkMRAID2  = 5
+	APIFrameworkMRAID3  = 6
+	APIFrameworkOMID1   = 7
+	APIFrameworkSIMID1  = 8
+	APIFrameworkSIMID11 = 9
 )
 
 // 5.7 Video Linearity
 const (
+	VideoLinearityUnknown   = 0
 	VideoLinearityLinear    = 1
 	VideoLinearityNonLinear = 2
 )
 
 // 5.8 Video and Audio Bid Response Protocols
 const (
+	ProtocolUnknown            = 0
 	VideoProtoVAST1            = 1
 	VideoProtoVAST2            = 2
 	VideoProtoVAST3            = 3
@@ -80,16 +510,9 @@ const (
 	AudioProtocolDAAST1Wrapper = 10
 )
 
-// 5.9 Video Playback Methods
-const (
-	VideoPlaybackAutoSoundOn  = 1
-	VideoPlaybackAutoSoundOff = 2
-	VideoPlaybackClickToPlay  = 3
-	VideoPlaybackMouseOver    = 4
-)
-
-// 5.9 Video Placement Types (Spec 2.5)
+// 5.9 Video Placement Types
 const (
+	VideoPlacementUnknown      = 0
 	VideoPlacementInStream     = 1
 	VideoPlacementInBanner     = 2
 	VideoPlacementInArticle    = 3
@@ -97,14 +520,25 @@ const (
 	VideoPlacementInterstitial = 5
 )
 
-// 5.10 Video Start Delay
+// 5.10 Video Playback Methods
+const (
+	VideoPlaybackUnknown       = 0
+	VideoPlaybackAutoSoundOn   = 1
+	VideoPlaybackAutoSoundOff  = 2
+	VideoPlaybackClickToPlay   = 3
+	VideoPlaybackMouseOver     = 4
+	VideoPlaybackEnterSoundOn  = 5
+	VideoPlaybackEnterSoundOff = 6
+)
+
+// 5.12 Video Start Delay
 const (
 	VideoStartDelayPreRoll         = 0
 	VideoStartDelayGenericMidRoll  = -1
 	VideoStartDelayGenericPostRoll = -2
 )
 
-// 5.11 Video Quality
+// 5.13 Video Quality
 const (
 	VideoQualityUnknown      = 0
 	VideoQualityProfessional = 1
@@ -112,21 +546,46 @@ const (
 	VideoQualityUGC          = 3
 )
 
-// 5.12 VAST Companion Types
+// 5.14 Companion Types
 const (
-	VASTCompanionStatic = 1
-	VASTCompanionHTML   = 2
-	VASTCompanionIFrame = 3
+	VASTCompanionUnknown = 0
+	VASTCompanionStatic  = 1
+	VASTCompanionHTML    = 2
+	VASTCompanionIFrame  = 3
 )
 
-// 5.13 Content Delivery Methods
+// 5.15 Content Delivery Methods
 const (
+	ContentDeliveryUnknown     = 0
 	ContentDeliveryStreaming   = 1
 	ContentDeliveryProgressive = 2
 	ContentDeliveryDownload    = 3
 )
 
-// 5.14 Content Context
+// FeedType as defined in section 5.16.
+type FeedType int
+
+// 5.16 Feed Types
+const (
+	FeedTypeUnknown   FeedType = 0
+	FeedTypeMusic     FeedType = 1
+	FeedTypeBroadcast FeedType = 2
+	FeedTypePodcast   FeedType = 3
+)
+
+// VolumeNorm as defined in section 5.17.
+type VolumeNorm int
+
+// 5.17 Volume Normalization Modes
+const (
+	VolumeNormNone     VolumeNorm = 0
+	VolumeNormAverage  VolumeNorm = 1
+	VolumeNormPeak     VolumeNorm = 2
+	VolumeNormLoudness VolumeNorm = 3
+	VolumeNormCustom   VolumeNorm = 4
+)
+
+// 5.18 Content Context
 const (
 	ContextVideo       = 1
 	ContextGame        = 2
@@ -137,21 +596,23 @@ const (
 	ContextUnknown     = 7
 )
 
-// 5.15 QAG Media Ratings
+// 5.19 IQG Media Ratings
 const (
-	QAGAll    = 1
-	QAGOver12 = 2
-	QAGMature = 3
+	QAGUnknown = 0
+	QAGAll     = 1
+	QAGOver12  = 2
+	QAGMature  = 3
 )
 
-// 5.16 Location Type
+// 5.20 Location Type
 const (
-	LocationTypeGPS  = 1
-	LocationTypeIP   = 2
-	LocationTypeUser = 3
+	LocationTypeUnknown = 0
+	LocationTypeGPS     = 1
+	LocationTypeIP      = 2
+	LocationTypeUser    = 3
 )
 
-// 5.17 Device Type
+// 5.21 Device Type
 const (
 	DeviceTypeUnknown   = 0
 	DeviceTypeMobile    = 1
@@ -161,9 +622,10 @@ const (
 	DeviceTypeTablet    = 5
 	DeviceTypeConnected = 6
 	DeviceTypeSetTopBox = 7
+	DeviceTypeOOH       = 8
 )
 
-// 5.18 Connection Type
+// 5.22 Connection Type
 const (
 	ConnTypeUnknown  = 0
 	ConnTypeEthernet = 1
@@ -175,7 +637,19 @@ const (
 	ConnTypeCell5G   = 7
 )
 
-// 5.19 No-Bid Reason Codes
+// IPLocation as defined in section 5.23.
+type IPLocation int
+
+// 5.22 IP Location Services
+const (
+	IPLocationUnknown     IPLocation = 0
+	IPLocationIP2Location IPLocation = 1
+	IPLocationNeustar     IPLocation = 2
+	IPLocationMaxMind     IPLocation = 3
+	IPLocationNetAquity   IPLocation = 4
+)
+
+// 5.24 No-Bid Reason Codes
 const (
 	NBRUnknownError      = 0
 	NBRTechnicalError    = 1
@@ -200,7 +674,7 @@ const (
 // type Content struct {
 // }
 
-// Abstract third-party
+// ThirdParty abstract attributes.
 type ThirdParty struct {
 	ID     string    `json:"id,omitempty"`
 	Name   string    `json:"name,omitempty"`
@@ -209,17 +683,17 @@ type ThirdParty struct {
 	Ext    Extension `json:"ext,omitempty"`
 }
 
-// The publisher object itself and all of its parameters are optional, so default values are not
+// Publisher object itself and all of its parameters are optional, so default values are not
 // provided. If an optional parameter is not specified, it should be considered unknown.
 type Publisher ThirdParty
 
-// The producer is useful when content where the ad is shown is syndicated, and may appear on a
+// Producer is useful when content where the ad is shown is syndicated, and may appear on a
 // completely different publisher. The producer object itself and all of its parameters are optional,
 // so default values are not provided. If an optional parameter is not specified, it should be
 // considered unknown.
 type Producer ThirdParty
 
-// Note that the Geo Object may appear in one or both the Device Object and the User Object.
+// Geo object may appear in one or both the Device Object and the User Object.
 // This is intentional, since the information may be derived from either a device-oriented source
 // (such as IP geo lookup), or by user registration information (for example provided to a publisher
 // through a user registration).
@@ -240,7 +714,7 @@ type Geo struct {
 	Ext           Extension `json:"ext,omitempty"`
 }
 
-// This object contains information known or derived about the human user of the device (i.e., the
+// User object contains information known or derived about the human user of the device (i.e., the
 // audience for advertising). The user id is an exchange artifact and may be subject to rotation or other
 // privacy policies. However, this user ID must be stable long enough to serve reasonably as the basis for
 // frequency capping and retargeting.
@@ -257,7 +731,7 @@ type User struct {
 	Ext        UserExtension `json:"ext,omitempty"`
 }
 
-// The data and segment objects together allow additional data about the user to be specified. This data
+// Data and segment objects together allow additional data about the user to be specified. This data
 // may be from multiple sources whether from the exchange itself or third party providers as specified by
 // the id field. A bid request can mix data objects from multiple providers. The specific data providers in
 // use should be published by the exchange a priori to its bidders.
@@ -278,20 +752,91 @@ type Segment struct {
 	Ext   Extension `json:"ext,omitempty"`
 }
 
-// This object contains any legal, governmental, or industry regulations that apply to the request. The
+// Regulations object contains any legal, governmental, or industry regulations that apply to the request. The
 // coppa flag signals whether or not the request falls under the United States Federal Trade Commission's
 // regulations for the United States Children's Online Privacy Protection Act ("COPPA").
 type Regulations struct {
-	Coppa int          `json:"coppa,omitempty"` // Flag indicating if this request is subject to the COPPA regulations established by the USA FTC, where 0 = no, 1 = yes.
-	Ext   RegExtension `json:"ext,omitempty"`
+	Coppa     int       `json:"coppa,omitempty"`      // Flag indicating if this request is subject to the COPPA regulations established by the USA FTC, where 0 = no, 1 = yes.
+	GDPR      int       `json:"gdpr,omitempty"`       // Flag that indicates whether or not the request is subject to GDPR regulations 0 = No, 1 = Yes, omission indicates Unknown.
+	USPrivacy string    `json:"us_privacy,omitempty"` // Communicates signals regarding consumer privacy under US privacy regulation.
+	Ext       Extension `json:"ext,omitempty"`
 }
 
-// This object represents an allowed size (i.e., height and width combination) for a banner impression.
+// Format object represents an allowed size (i.e., height and width combination) for a banner impression.
 // These are typically used in an array for an impression where multiple sizes are permitted.
+// It is recommended that either the w/h pair or the wratio/hratio/wmin set (i.e., for Flex Ads) be specified.
 type Format struct {
-	W   int       `json:"w,omitempty"` // Width in device independent pixels (DIPS).
-	H   int       `json:"h,omitempty"` //Height in device independent pixels (DIPS).
-	Ext Extension `json:"ext,omitempty"`
+	W           int       `json:"w,omitempty"`       // Width in device independent pixels (DIPS).
+	H           int       `json:"h,omitempty"`       // Height in device independent pixels (DIPS).
+	WidthRatio  int       `json:"wratio,omitempty"`  // Relative width when expressing size as a ratio.
+	HeightRatio int       `json:"hration,omitempty"` // Relative height when expressing size as a ratio.
+	WidthMin    int       `json:"wmin,omitempty"`    // The minimum width in device independent pixels (DIPS) at which the ad will be displayed the size is expressed as a ratio.
+	Ext         Extension `json:"ext,omitempty"`
+}
+
+// PodSequence identifies the pod sequence field, for use in video content streams with one or more ad pods as defined in Adcom1.0
+type PodSequence int
+
+// PodSequence options as defined in Adcom1.0
+const (
+	PodSeqLast  PodSequence = -1 // Last pod in the content stream.
+	PodSeqAny   PodSequence = 0  // Any pod in the content stream.
+	PodSeqFirst PodSequence = 1  // First pod in the content stream.
+)
+
+// SlotPositionInPod identifies the slot position in pod field, for use in video ad pods as defined in Adcom1.0
+type SlotPositionInPod int
+
+// SlotPositionInPod options as defined in Adcom1.0
+const (
+	SlotPosLast        SlotPositionInPod = -1 // Last ad in the pod.
+	SlotPosAny         SlotPositionInPod = 0  // Any ad in the pod.
+	SlotPosFirst       SlotPositionInPod = 1  // First ad in the pod.
+	SlotPosFirstOrLast SlotPositionInPod = 2  // First or Last ad in the pod.
+)
+
+// Type of the creative markup so that it can properly be associated with the right sub-object of the BidRequest.Imp.
+type MarkupType int
+
+// MarkupType available options
+const (
+	MarkupUnknown MarkupType = 0
+	MarkupBanner  MarkupType = 1
+	MarkupVideo   MarkupType = 2
+	MarkupAudio   MarkupType = 3
+	MarkupNative  MarkupType = 4
+)
+
+// CategoryTaxonomy identifies the taxonomy in effect when content categories as defined in Adcom1.0.
+type CategoryTaxonomy int
+
+// CategoryTaxonomy options as defined in Adcom1.0
+const (
+	CategoryTaxonomyIABContent1   CategoryTaxonomy = 1 // 1	IAB Content Category Taxonomy 1.0.
+	CategoryTaxonomyIABContent2   CategoryTaxonomy = 2 // 2	IAB Content Category Taxonomy 2: www.iab.com/guidelines/taxonomy
+	CategoryTaxonomyIABProduct1   CategoryTaxonomy = 3 // 3	IAB Ad Product Taxonomy 1.0.
+	CategoryTaxonomyIABAudience11 CategoryTaxonomy = 4 // 4	IAB Audience Taxonomy 1.1.
+	CategoryTaxonomyIABContent21  CategoryTaxonomy = 5 // 5	IAB Content Category Taxonomy 2.1.
+	CategoryTaxonomyIABContent22  CategoryTaxonomy = 6 // 6	IAB Content Category Taxonomy 2.2
+)
+
+// VideoPlcmt represents the the various types of video placements in accordance with updated IAB Digital Video Guidelines.
+type VideoPlcmt int
+
+// Types of video placements derived largely from the IAB Digital Video Guidelines.
+const (
+	VideoPlcmtInstream            VideoPlcmt = 1
+	VideoPlcmtAccompanyingContent VideoPlcmt = 2
+	VideoPlcmtInterstitial        VideoPlcmt = 3
+	VideoPlcmtNoContent           VideoPlcmt = 4
+)
+
+// ChannelEntity describes the network or channel an ad will be displayed on. (Reffer Section 3.2.23 and 3.2.24 OpenRTB_2.6)
+type ChannelEntity struct {
+	ID     string    `json:"id,omitempty"`
+	Name   string    `json:"name,omitempty"`
+	Domain string    `json:"domain,omitempty"`
+	Ext    Extension `json:"ext,omitempty"`
 }
 
 // RegExtension Extension object for Regulations
diff --git a/openrtb_test.go b/openrtb_test.go
index a821e5e..2ba595c 100644
--- a/openrtb_test.go
+++ b/openrtb_test.go
@@ -1,28 +1,17 @@
-package openrtb
+package openrtb_test
 
 import (
 	"encoding/json"
 	"os"
 	"path/filepath"
-	"testing"
-
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
 )
 
-func TestSuite(t *testing.T) {
-	RegisterFailHandler(Fail)
-	RunSpecs(t, "openrtb")
-}
-
-func iptr(n int) *int       { return &n }
-func sptr(s string) *string { return &s }
-
 func fixture(fname string, v interface{}) error {
 	f, err := os.Open(filepath.Join("testdata", fname+".json"))
 	if err != nil {
 		return err
 	}
 	defer f.Close()
+
 	return json.NewDecoder(f).Decode(v)
 }
diff --git a/pmp.go b/pmp.go
index 9078e27..d001f10 100644
--- a/pmp.go
+++ b/pmp.go
@@ -2,14 +2,14 @@ package openrtb
 
 import "encoding/json"
 
-// Private Marketplace Object
+// Pmp is the Private Marketplace Object
 type Pmp struct {
 	Private int       `json:"private_auction,omitempty"`
 	Deals   []Deal    `json:"deals,omitempty"`
 	Ext     Extension `json:"ext,omitempty"`
 }
 
-// PMP Deal
+// Deal contains PMP deal information.
 type Deal struct {
 	ID               string    `json:"id,omitempty"` // Unique deal ID
 	BidFloor         float64   `json:"bidfloor,omitempty"`
diff --git a/pmp_test.go b/pmp_test.go
index 2f16436..6e55d02 100644
--- a/pmp_test.go
+++ b/pmp_test.go
@@ -1,34 +1,38 @@
-package openrtb
+package openrtb_test
 
 import (
+	"bytes"
 	"encoding/json"
+	"reflect"
+	"testing"
 
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Pmp", func() {
+func TestPMP(t *testing.T) {
 	var subject *Pmp
+	if err := fixture("pmp", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("pmp", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
+	exp := &Pmp{
+		Private: 1,
+		Deals: []Deal{
+			{ID: "DX-1985-010A", BidFloor: 2.5, BidFloorCurrency: "", AuctionType: 2},
+			{ID: "DX-1986-010A", BidFloor: 2.6, BidFloorCurrency: "", AuctionType: 2},
+		},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Pmp{
-			Private: 1,
-			Deals: []Deal{
-				{ID: "DX-1985-010A", BidFloor: 2.5, BidFloorCurrency: "", AuctionType: 2},
-				{ID: "DX-1986-010A", BidFloor: 2.6, BidFloorCurrency: "", AuctionType: 2},
-			},
-		}))
-	})
-
-	It("should generate correctly", func() {
-		bin, err := json.Marshal(&Pmp{Deals: []Deal{{}}})
-		Expect(err).NotTo(HaveOccurred())
-		Expect(string(bin)).To(Equal(`{"deals":[{"at":2}]}`))
-	})
-
-})
+func TestPMP_MarshalJSON(t *testing.T) {
+	subject := &Pmp{Deals: []Deal{{}}}
+	exp := []byte(`{"deals":[{"at":2}]}`)
+	if got, err := json.Marshal(subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	} else if !bytes.Equal(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/quantity.go b/quantity.go
new file mode 100644
index 0000000..010587b
--- /dev/null
+++ b/quantity.go
@@ -0,0 +1,36 @@
+package openrtb
+
+import (
+	"errors"
+)
+
+var (
+	ErrMissingMultiplier        = errors.New("openrtb: qty.multiplier is required")
+	ErrMissingMeasurementVendor = errors.New("openrtb: qty.vendor is required when qty.sourcetype is 1 (Measurement Vendor)")
+)
+
+type MeasurementSourceType int
+
+const (
+	MeasurementSourceTypeUnknown           MeasurementSourceType = 0
+	MeasurementSourceTypeMeasurementVendor MeasurementSourceType = 1
+	MeasurementSourceTypePublisher         MeasurementSourceType = 2
+	MeasurementSourceTypeExchange          MeasurementSourceType = 3
+)
+
+type Quantity struct {
+	Multiplier float64               `json:"multiplier"`
+	SourceType MeasurementSourceType `json:"sourcetype,omitempty"`
+	Vendor     string                `json:"vendor,omitempty"`
+	Ext        Extension             `json:"ext,omitempty"`
+}
+
+func (qty *Quantity) Validate() error {
+	if qty.Multiplier == 0 {
+		return ErrMissingMultiplier
+	}
+	if qty.SourceType == MeasurementSourceTypeMeasurementVendor && qty.Vendor == "" {
+		return ErrMissingMeasurementVendor
+	}
+	return nil
+}
diff --git a/quantity_test.go b/quantity_test.go
new file mode 100644
index 0000000..d22bc4f
--- /dev/null
+++ b/quantity_test.go
@@ -0,0 +1,55 @@
+package openrtb_test
+
+import (
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
+)
+
+func TestQuantity(t *testing.T) {
+	var subject *Quantity
+	if err := fixture("quantity", &subject); err != nil {
+		t.Fatalf("expected no error, got %+v", err)
+	}
+
+	exp := &Quantity{
+		Multiplier: 3.14,
+		SourceType: MeasurementSourceTypePublisher,
+	}
+
+	if !reflect.DeepEqual(exp, subject) {
+		t.Fatalf("expected %+v, got %+v", exp, subject)
+	}
+}
+
+func TestQuantity_Validate(t *testing.T) {
+	subject := Quantity{}
+	if got := subject.Validate(); got != ErrMissingMultiplier {
+		t.Fatalf("expected %+v, got %+v", ErrMissingMultiplier, got)
+	}
+
+	// If MeasurementSourceType is MeasurementSourceTypeMeasurementVendor, the
+	// Vendor field should not be empty.
+	subject = Quantity{
+		Multiplier: 1.0,
+		SourceType: MeasurementSourceTypeMeasurementVendor,
+	}
+	if got := subject.Validate(); got != ErrMissingMeasurementVendor {
+		t.Fatalf("expected %+v, got %+v", ErrMissingMeasurementVendor, got)
+	}
+
+	subject.Vendor = "TestVendor" // Should fix the invalid Quantity
+	if got := subject.Validate(); got != nil {
+		t.Fatalf("expected no error, got %+v", got)
+	}
+
+	// All other value from MeasurementSourceType can be used without Vendor
+	subject = Quantity{
+		Multiplier: 2.0,
+		SourceType: MeasurementSourceTypeUnknown,
+	}
+	if got := subject.Validate(); got != nil {
+		t.Fatalf("expected nil, got %+v", got)
+	}
+}
diff --git a/seatbid.go b/seatbid.go
index fa8bf27..1ace4a3 100644
--- a/seatbid.go
+++ b/seatbid.go
@@ -1,8 +1,10 @@
 package openrtb
 
-import "errors"
+import (
+	"errors"
+)
 
-// At least one of Bid is required.
+// SeatBid contains seat information. At least one of Bid is required.
 // A bid response can contain multiple "seatbid” objects, each on behalf of a different bidder seat.
 // SeatBid object can contain multiple bids each pertaining to a different impression on behalf of a seat.
 // Each "bid” object must include the impression ID to which it pertains as well as the bid price.
@@ -26,8 +28,9 @@ func (sb *SeatBid) Validate() error {
 		return ErrInvalidSeatBidBid
 	}
 
-	for _, bid := range sb.Bid {
-		if err := bid.Validate(); err != nil {
+	for i := range sb.Bid {
+		bid := sb.Bid[i]
+		if err := (&bid).Validate(); err != nil {
 			return err
 		}
 	}
diff --git a/seatbid_test.go b/seatbid_test.go
index 323cd8e..f768c1c 100644
--- a/seatbid_test.go
+++ b/seatbid_test.go
@@ -1,17 +1,15 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
-)
-
-var _ = Describe("SeatBid", func() {
+	"errors"
+	"testing"
 
-	It("should validate", func() {
-		Expect((&SeatBid{}).Validate()).To(Equal(ErrInvalidSeatBidBid))
-		Expect((&SeatBid{Bid: []Bid{
-			{ID: "BIDID", ImpID: "IMPID"}},
-		}).Validate()).NotTo(HaveOccurred())
-	})
+	. "github.com/UnityTech/openrtb"
+)
 
-})
+func TestSeatBid_Validate(t *testing.T) {
+	subject := &SeatBid{}
+	if exp, got := ErrInvalidSeatBidBid, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}
diff --git a/source.go b/source.go
index 615ceb8..e187215 100644
--- a/source.go
+++ b/source.go
@@ -2,7 +2,7 @@ package openrtb
 
 // Source object describes the nature and behavior of the entity that is the source of the bid request upstream from the exchange.
 type Source struct {
-	FinalSaleDecision int       `json:"fd"`               // Entity responsible for the final impression sale decision, where 0 = exchange, 1 = upstream source.
+	FinalSaleDecision int       `json:"fd,omitempty"`     // Entity responsible for the final impression sale decision, where 0 = exchange, 1 = upstream source.
 	TransactionID     string    `json:"tid,omitempty"`    // Transaction ID that must be common across all participants in this bid request (e.g., potentially multiple exchanges).
 	PaymentChain      string    `json:"pchain,omitempty"` // Payment ID chain string containing embedded syntax described in the TAG Payment ID Protocol v1.0.
 	Ext               Extension `json:"ext,omitempty"`    // Placeholder for exchange-specific extensions to OpenRTB.
diff --git a/source_test.go b/source_test.go
index 75c21bf..2bfb2b1 100644
--- a/source_test.go
+++ b/source_test.go
@@ -1,24 +1,25 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Source", func() {
+func TestSource(t *testing.T) {
 	var subject *Source
+	if err := fixture("source", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("source", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Source{
-			FinalSaleDecision: 1,
-			TransactionID:     "transaction-id",
-			PaymentChain:      "payment-chain",
-			Ext:               Extension("{}"),
-		}))
-	})
-})
+	exp := &Source{
+		FinalSaleDecision: 1,
+		TransactionID:     "transaction-id",
+		PaymentChain:      "payment-chain",
+		Ext:               Extension("{}"),
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
diff --git a/sua.go b/sua.go
new file mode 100644
index 0000000..0f0f92d
--- /dev/null
+++ b/sua.go
@@ -0,0 +1,18 @@
+package openrtb
+
+type UserAgent struct {
+	Browsers     []BrandVersion `json:"browsers,omitempty"`     // A browser or similar software component
+	Platform     BrandVersion   `json:"platform,omitempty"`     // The user agent’s execution platform / OS
+	Mobile       int            `json:"mobile,omitempty"`       // 1 if the agent prefers a "mobile" version of the content, if available, i.e. optimized for small screens or touch input. 0 if the agent prefers the "desktop". Taken from Sec-CH-UAMobile header
+	Architecture string         `json:"architecture,omitempty"` // Device’s major binary architecture, e.g. "x86" or "arm". Taken from the Sec-CH-UA-Arch header
+	Bitness      string         `json:"bitness,omitempty"`      // Device’s bitness, e.g. "64" for 64-bit architecture. Taken from the Sec-CH-UA-Bitness header
+	Model        string         `json:"model,omitempty"`        // Device model. Taken from the Sec-CH-UAModel header
+	Source       int            `json:"source,omitempty"`       // The source of data used to create this object, List: User-Agent Source in AdCOM 1.0
+	Ext          Extension      `json:"ext,omitempty"`
+}
+
+type BrandVersion struct {
+	Brand   string    `json:"brand,omitempty"`   // A brand identifier, for example, "Chrome" or "Windows". Taken from the Sec-CH-UA-Full-Version or Sec-CH-UA-Platform header
+	Version []string  `json:"version,omitempty"` // A sequence of version components, in descending hierarchical order (major, minor, patch)
+	Ext     Extension `json:"ext,omitempty"`
+}
diff --git a/testdata/banner.json b/testdata/banner.json
index 245fb14..4a64ce9 100644
--- a/testdata/banner.json
+++ b/testdata/banner.json
@@ -10,5 +10,6 @@
   ],
   "api": [
     3
-  ]
+  ],
+  "vcm": 1
 }
diff --git a/testdata/content.quoted.json b/testdata/content.quoted.json
new file mode 100644
index 0000000..e88e1d8
--- /dev/null
+++ b/testdata/content.quoted.json
@@ -0,0 +1,16 @@
+{
+  "keywords": "Orwell, 1984",
+  "userrating": "3",
+  "episode": 1,
+  "title": "This is the video title",
+  "url": "http://cdnp.tremormedia.com/video/1984.flv",
+  "livestream": 0,
+  "contentrating": "G",
+  "len": 129,
+  "series": "book reading",
+  "videoquality": 2,
+  "context": 1,
+  "season": "1",
+  "sourcerelationship": 0,
+  "id": "eb9f13ede5fd225333971523f6042f9d"
+}
diff --git a/testdata/device.json b/testdata/device.json
index 98b7e55..bcba212 100644
--- a/testdata/device.json
+++ b/testdata/device.json
@@ -22,5 +22,6 @@
   "js": 1,
   "connectiontype": 3,
   "mccmnc": "722-341",
-  "devicetype": 1
+  "devicetype": 1,
+  "oaid": "1fe9a970-efbb-29e0-0bdd-f5dbbf751ab5"
 }
diff --git a/testdata/impression.json b/testdata/impression.json
index 5a1ba0b..b0db1e8 100644
--- a/testdata/impression.json
+++ b/testdata/impression.json
@@ -27,5 +27,9 @@
         "at": 2
       }
     ]
-  }
+  },
+  "qty": {
+    "multiplier": 1.0
+  },
+  "rwdd": 1
 }
diff --git a/testdata/quantity.json b/testdata/quantity.json
new file mode 100644
index 0000000..1d03a4e
--- /dev/null
+++ b/testdata/quantity.json
@@ -0,0 +1,4 @@
+{
+  "multiplier": 3.14,
+  "sourcetype": 2
+}
diff --git a/video.go b/video.go
index 296537d..dd74b64 100644
--- a/video.go
+++ b/video.go
@@ -14,40 +14,47 @@ var (
 	ErrInvalidVideoNoProtocols   = errors.New("openrtb: video protocols missing")
 )
 
-// The "video" object must be included directly in the impression object if the impression offered
+// Video object must be included directly in the impression object if the impression offered
 // for auction is an in-stream video ad opportunity.
 type Video struct {
-	Mimes          []string  `json:"mimes,omitempty"`          // Content MIME types supported.
-	MinDuration    int       `json:"minduration,omitempty"`    // Minimum video ad duration in seconds
-	MaxDuration    int       `json:"maxduration,omitempty"`    // Maximum video ad duration in seconds
-	Protocols      []int     `json:"protocols,omitempty"`      // Video bid response protocols
-	Protocol       int       `json:"protocol,omitempty"`       // Video bid response protocols DEPRECATED
-	W              int       `json:"w,omitempty"`              // Width of the player in pixels
-	H              int       `json:"h,omitempty"`              // Height of the player in pixels
-	StartDelay     int       `json:"startdelay,omitempty"`     // Indicates the start delay in seconds
-	Linearity      int       `json:"linearity,omitempty"`      // Indicates whether the ad impression is linear or non-linear
-	Skip           int       `json:"skip,omitempty"`           // Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes.
-	SkipMin        int       `json:"skipmin,omitempty"`        // Videos of total duration greater than this number of seconds can be skippable
-	SkipAfter      int       `json:"skipafter,omitempty"`      // Number of seconds a video must play before skipping is enabled
-	Sequence       int       `json:"sequence,omitempty"`       // Default: 1
-	BAttr          []int     `json:"battr,omitempty"`          // Blocked creative attributes
-	MaxExtended    int       `json:"maxextended,omitempty"`    // Maximum extended video ad duration
-	MinBitrate     int       `json:"minbitrate,omitempty"`     // Minimum bit rate in Kbps
-	MaxBitrate     int       `json:"maxbitrate,omitempty"`     // Maximum bit rate in Kbps
-	BoxingAllowed  *int      `json:"boxingallowed,omitempty"`  // If exchange publisher has rules preventing letter boxing
-	PlaybackMethod []int     `json:"playbackmethod,omitempty"` // List of allowed playback methods
-	Delivery       []int     `json:"delivery,omitempty"`       // List of supported delivery methods
-	Pos            int       `json:"pos,omitempty"`            // Ad Position
-	CompanionAd    []Banner  `json:"companionad,omitempty"`
-	Api            []int     `json:"api,omitempty"` // List of supported API frameworks
-	CompanionType  []int     `json:"companiontype,omitempty"`
-	Placement      int       `json:"placement,omitempty"` // Video placement type
-	Ext            Extension `json:"ext,omitempty"`
+	Mimes           []string          `json:"mimes,omitempty"`          // Content MIME types supported.
+	MinDuration     int               `json:"minduration,omitempty"`    // Minimum video ad duration in seconds
+	MaxDuration     int               `json:"maxduration,omitempty"`    // Maximum video ad duration in seconds
+	Protocols       []int             `json:"protocols,omitempty"`      // Video bid response protocols
+	Protocol        int               `json:"protocol,omitempty"`       // Video bid response protocols DEPRECATED
+	W               int               `json:"w,omitempty"`              // Width of the player in pixels
+	H               int               `json:"h,omitempty"`              // Height of the player in pixels
+	StartDelay      int               `json:"startdelay,omitempty"`     // Indicates the start delay in seconds
+	Linearity       int               `json:"linearity,omitempty"`      // Indicates whether the ad impression is linear or non-linear
+	Skip            int               `json:"skip,omitempty"`           // Indicates if the player will allow the video to be skipped, where 0 = no, 1 = yes.
+	SkipMin         int               `json:"skipmin,omitempty"`        // Videos of total duration greater than this number of seconds can be skippable
+	SkipAfter       int               `json:"skipafter,omitempty"`      // Number of seconds a video must play before skipping is enabled
+	Sequence        int               `json:"sequence,omitempty"`       // Default: 1
+	BAttr           []int             `json:"battr,omitempty"`          // Blocked creative attributes
+	MaxExtended     int               `json:"maxextended,omitempty"`    // Maximum extended video ad duration
+	MinBitrate      int               `json:"minbitrate,omitempty"`     // Minimum bit rate in Kbps
+	MaxBitrate      int               `json:"maxbitrate,omitempty"`     // Maximum bit rate in Kbps
+	BoxingAllowed   *int              `json:"boxingallowed,omitempty"`  // If exchange publisher has rules preventing letter boxing
+	PodID           string            `json:"podid,omitempty"`          // Pod id unique identifier for video ad pod
+	PodDuration     int               `json:"poddur,omitempty"`         // Pod Duration total amount of time in seconds that advertisers may fill for a video ad pod
+	PodSequence     PodSequence       `json:"podseq,omitempty"`         // Pod Sequence position of the video ad pod
+	SlotInPod       SlotPositionInPod `json:"slotinpod,omitempty"`      // Slot Position in ad
+	RqdDurs         []int64           `json:"rqddurs,omitempty"`        // Precise acceptable durations for video creatives inseconds.
+	MinCPMPerSecond float64           `json:"mincpmpersec,omitempty"`   //   Minimum CPM per second. This is a price floor for the portion of a video ad pod
+	PlaybackMethod  []int             `json:"playbackmethod,omitempty"` // List of allowed playback methods
+	Delivery        []int             `json:"delivery,omitempty"`       // List of supported delivery methods
+	Pos             int               `json:"pos,omitempty"`            // Ad Position
+	CompanionAd     []Banner          `json:"companionad,omitempty"`
+	Api             []int             `json:"api,omitempty"` // List of supported API frameworks
+	CompanionType   []int             `json:"companiontype,omitempty"`
+	Placement       int               `json:"placement,omitempty"` // Video placement type, DEPRECATED
+	Plcmt           VideoPlcmt        `json:"plcmt,omitempty"`     // Video Plcmt type ad defined in ADCOM1.0
+	Ext             Extension         `json:"ext,omitempty"`
 }
 
 type jsonVideo Video
 
-// Validates the object
+// Validate the object
 func (v *Video) Validate() error {
 	if len(v.Mimes) == 0 {
 		return ErrInvalidVideoNoMimes
diff --git a/video_test.go b/video_test.go
index 56ef3df..e3f7a98 100644
--- a/video_test.go
+++ b/video_test.go
@@ -1,69 +1,71 @@
-package openrtb
+package openrtb_test
 
 import (
-	. "github.com/onsi/ginkgo"
-	. "github.com/onsi/gomega"
+	"errors"
+	"reflect"
+	"testing"
+
+	. "github.com/UnityTech/openrtb"
 )
 
-var _ = Describe("Video", func() {
+func TestVideo(t *testing.T) {
 	var subject *Video
+	if err := fixture("video", &subject); err != nil {
+		t.Fatalf("expected no error, got %v", err)
+	}
 
-	BeforeEach(func() {
-		err := fixture("video", &subject)
-		Expect(err).NotTo(HaveOccurred())
-	})
-
-	It("should parse correctly", func() {
-		Expect(subject).To(Equal(&Video{
-			Mimes: []string{
-				"video/x-flv",
-				"video/mp4",
-				"application/x-shockwave-flash",
-				"application/javascript",
-			},
-			MinDuration:    5,
-			MaxDuration:    30,
-			Protocols:      []int{VideoProtoVAST2, VideoProtoVAST3},
-			W:              640,
-			H:              480,
-			Linearity:      VideoLinearityLinear,
-			Sequence:       1,
-			BAttr:          []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
-			MaxExtended:    30,
-			MinBitrate:     300,
-			MaxBitrate:     1500,
-			BoxingAllowed:  iptr(1),
-			PlaybackMethod: []int{VideoPlaybackAutoSoundOn, VideoPlaybackClickToPlay},
-			Delivery:       []int{ContentDeliveryProgressive},
-			Pos:            AdPosAboveFold,
-			CompanionAd: []Banner{
-				{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
-				{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
-			},
-			Placement:     VideoPlacementInStream,
-			Api:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
-			CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
-		}))
-	})
-
-	It("should validate", func() {
-		Expect((&Video{}).Validate()).To(Equal(ErrInvalidVideoNoMimes))
-		Expect((&Video{
-			Mimes: []string{"video/mp4"},
-		}).Validate()).To(Equal(ErrInvalidVideoNoLinearity))
-		Expect((&Video{
-			MinDuration: 1,
-			MaxDuration: 1,
-			Linearity:   VideoLinearityNonLinear,
-			Mimes:       []string{"video/mp4"},
-		}).Validate()).To(Equal(ErrInvalidVideoNoProtocols))
-		Expect((&Video{
-			Protocol:    VideoProtoVAST3,
-			MinDuration: 1,
-			MaxDuration: 1,
-			Linearity:   VideoLinearityNonLinear,
-			Mimes:       []string{"video/mp4"},
-		}).Validate()).NotTo(HaveOccurred())
-	})
+	boxingAllowed := 1
+	exp := &Video{
+		Mimes: []string{
+			"video/x-flv",
+			"video/mp4",
+			"application/x-shockwave-flash",
+			"application/javascript",
+		},
+		MinDuration:    5,
+		MaxDuration:    30,
+		Protocols:      []int{VideoProtoVAST2, VideoProtoVAST3},
+		W:              640,
+		H:              480,
+		Linearity:      VideoLinearityLinear,
+		Sequence:       1,
+		BAttr:          []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert},
+		MaxExtended:    30,
+		MinBitrate:     300,
+		MaxBitrate:     1500,
+		BoxingAllowed:  &boxingAllowed,
+		PlaybackMethod: []int{VideoPlaybackAutoSoundOn, VideoPlaybackClickToPlay},
+		Delivery:       []int{ContentDeliveryProgressive},
+		Pos:            AdPosAboveFold,
+		CompanionAd: []Banner{
+			{W: 300, H: 250, ID: "1234567893-1", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}, ExpDir: []int{ExpDirRight, ExpDirDown}},
+			{W: 728, H: 90, ID: "1234567893-2", Pos: AdPosAboveFold, BAttr: []int{CreativeAttributeUserInitiated, CreativeAttributeWindowsDialogOrAlert}},
+		},
+		Placement:     VideoPlacementInStream,
+		Api:           []int{APIFrameworkVPAID1, APIFrameworkVPAID2},
+		CompanionType: []int{VASTCompanionStatic, VASTCompanionHTML},
+	}
+	if got := subject; !reflect.DeepEqual(exp, got) {
+		t.Errorf("expected %+v, got %+v", exp, got)
+	}
+}
 
-})
+func TestVideo_Validate(t *testing.T) {
+	subject := &Video{}
+	if exp, got := ErrInvalidVideoNoMimes, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &Video{Mimes: []string{"video/mp4"}}
+	if exp, got := ErrInvalidVideoNoLinearity, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+	subject = &Video{
+		MinDuration: 1,
+		MaxDuration: 1,
+		Linearity:   VideoLinearityNonLinear,
+		Mimes:       []string{"video/mp4"},
+	}
+	if exp, got := ErrInvalidVideoNoProtocols, subject.Validate(); !errors.Is(exp, got) {
+		t.Fatalf("expected %v, got %v", exp, got)
+	}
+}