--- a/git/tests/test-mozreview-push-basic.t
+++ b/git/tests/test-mozreview-push-basic.t
@@ -58,25 +58,26 @@ Reviews should be published and Bugzilla
   - '1'
   commit: bz://1/mynick
   submitter: default+5
   summary: bz://1/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
     calculated_trophies: true
+    p2rb.reviewer_map: '{}'
+  commit_extra_data:
     p2rb: true
     p2rb.base_commit: 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
     p2rb.commits: '[["f7ac6c88ab11801e6f7e22b2de292ed6bd1932a4", 2], ["fc8ecbaed44d222dcc9735a5019f21ca00e003b4",
       3]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: true
-    p2rb.reviewer_map: '{}'
     p2rb.unpublished_rids: '[]'
   diffs:
   - id: 1
     revision: 1
     base_commit_id: 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
     name: diff
     extra: {}
     patch:
@@ -100,16 +101,17 @@ Reviews should be published and Bugzilla
   summary: Bug 1 - Foo 1
   description:
   - Bug 1 - Foo 1
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: f7ac6c88ab11801e6f7e22b2de292ed6bd1932a4
     p2rb.first_public_ancestor: 96ee1d7354c4ad7372047672c36a1f561e3a6a4c
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1

--- a/pylib/mozreviewbots/tests/test-eslintbot-noop.t
+++ b/pylib/mozreviewbots/tests/test-eslintbot-noop.t
@@ -51,16 +51,17 @@ Create a review request that doesn't tou
   summary: Bug 1 - No Javascript changes
   description:
   - Bug 1 - No Javascript changes
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 27ed10e6e90a514ad461a5a7147a9134de0ca799
     p2rb.first_public_ancestor: dc42edca6edd9dd5a8346b1a881281263d3a10ad
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1

--- a/pylib/mozreviewbots/tests/test-eslintbot.t
+++ b/pylib/mozreviewbots/tests/test-eslintbot.t
@@ -55,16 +55,17 @@ Create a review request with some busted
   summary: Bug 1 - Some busted Javascript
   description:
   - Bug 1 - Some busted Javascript
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 719ed7ed9e3e1a340f443981aa91125b68598369
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1

--- a/pylib/mozreviewbots/tests/test-pylintbot-diff-context.t
+++ b/pylib/mozreviewbots/tests/test-pylintbot-diff-context.t
@@ -47,16 +47,17 @@ be ignored
   summary: Bug 1 - Verify diff context
   description:
   - Bug 1 - Verify diff context
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 3a773b9e226cc5486fdd724372938f77204ff12c
     p2rb.first_public_ancestor: 3edbb5ae6222fc9890db26538597a9b417cb7b94
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1

--- a/pylib/mozreviewbots/tests/test-pylintbot-line-adjustment.t
+++ b/pylib/mozreviewbots/tests/test-pylintbot-line-adjustment.t
@@ -94,16 +94,17 @@ Line numbers for these failures should b
   summary: Bug 1 - Line adjustment minus 1
   description:
   - Bug 1 - Line adjustment minus 1
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: c45aead0c4d66a05a22fce427658fba6f3e20f9c
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1
@@ -301,16 +302,17 @@ Create tests for line -= 2
   summary: Bug 2 - Line adjustment minus 2
   description:
   - Bug 2 - Line adjustment minus 2
   - ''
   - 'MozReview-Commit-ID: 5ijR9k'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 51dfa0ded22aa53d3e7c3d7b5342ba8734c4c6ce
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 4
     revision: 1

--- a/pylib/mozreviewbots/tests/test-pylintbot-noop.t
+++ b/pylib/mozreviewbots/tests/test-pylintbot-noop.t
@@ -29,16 +29,17 @@ No review should be left if no Python fi
   summary: Bug 1 - No Python changes
   description:
   - Bug 1 - No Python changes
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 97bc3c7259dfe4c83e2d1ac3e6b252a5331da9cd
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1
@@ -83,24 +84,25 @@ Expecting 0 reviews
   - '2'
   commit: bz://2/mynick
   submitter: default+5
   summary: bz://2/mynick
   description: This is the parent review request
   target_people: []
   extra_data:
     calculated_trophies: true
+    p2rb.reviewer_map: '{}'
+  commit_extra_data:
     p2rb: true
     p2rb.base_commit: 98dca3b6ee0c2e2bfa0921991abd87ed7abe7baf
     p2rb.commits: '[["bbd1278082cfb76d7c5c4422748d5cf8679a5bcd", 4]]'
     p2rb.discard_on_publish_rids: '[]'
     p2rb.first_public_ancestor: 98dca3b6ee0c2e2bfa0921991abd87ed7abe7baf
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: true
-    p2rb.reviewer_map: '{}'
     p2rb.unpublished_rids: '[]'
   diffs:
   - id: 3
     revision: 1
     base_commit_id: 98dca3b6ee0c2e2bfa0921991abd87ed7abe7baf
     name: diff
     extra: {}
     patch:

--- a/pylib/mozreviewbots/tests/test-pylintbot.t
+++ b/pylib/mozreviewbots/tests/test-pylintbot.t
@@ -33,16 +33,17 @@ Create a review with Python style violat
   summary: Bug 1 - Bad Python
   description:
   - Bug 1 - Bad Python
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 1978e5417012a5f63128d09cfd52c52077c761cb
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1
@@ -140,16 +141,17 @@ Ensure pyflakes warnings are handled
   summary: Bug 2 - pyflakes
   description:
   - Bug 2 - pyflakes
   - ''
   - 'MozReview-Commit-ID: 5ijR9k'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: c768227fc261de5a93e0c813e0ba4a54e24d2697
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://2/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 4
     revision: 1

--- a/pylib/mozreviewbots/tests/test-snarkbot.t
+++ b/pylib/mozreviewbots/tests/test-snarkbot.t
@@ -91,16 +91,17 @@ Create and publish a review for SnarkBot
   summary: Bug 1 - Foo 1
   description:
   - Bug 1 - Foo 1
   - ''
   - 'MozReview-Commit-ID: 124Bxg'
   target_people: []
   extra_data:
     calculated_trophies: true
+  commit_extra_data:
     p2rb: true
     p2rb.commit_id: 729692c35796d9cbd453ccef97ee0d14139c4a09
     p2rb.first_public_ancestor: 7c5bdf0cec4a90edb36300f8f3679857f46db829
     p2rb.identifier: bz://1/mynick
     p2rb.is_squashed: false
   diffs:
   - id: 2
     revision: 1