diff --git a/tests/phpunit/tests/rest-api/rest-schema-setup.php b/tests/phpunit/tests/rest-api/rest-schema-setup.php
index 0b1811a145..46d15c3c7c 100644
--- a/tests/phpunit/tests/rest-api/rest-schema-setup.php
+++ b/tests/phpunit/tests/rest-api/rest-schema-setup.php
@@ -476,6 +476,7 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'Schema.routes./wp/v2/posts._links.self'           => 'http://example.org/index.php?rest_route=/wp/v2/posts',
 		'Schema.routes./wp/v2/pages._links.self'           => 'http://example.org/index.php?rest_route=/wp/v2/pages',
 		'Schema.routes./wp/v2/media._links.self'           => 'http://example.org/index.php?rest_route=/wp/v2/media',
+		'Schema.routes./wp/v2/blocks._links.self'          => 'http://example.org/index.php?rest_route=/wp/v2/blocks',
 		'Schema.routes./wp/v2/types._links.self'           => 'http://example.org/index.php?rest_route=/wp/v2/types',
 		'Schema.routes./wp/v2/statuses._links.self'        => 'http://example.org/index.php?rest_route=/wp/v2/statuses',
 		'Schema.routes./wp/v2/taxonomies._links.self'      => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies',
@@ -484,7 +485,9 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'Schema.routes./wp/v2/users._links.self'           => 'http://example.org/index.php?rest_route=/wp/v2/users',
 		'Schema.routes./wp/v2/users/me._links.self'        => 'http://example.org/index.php?rest_route=/wp/v2/users/me',
 		'Schema.routes./wp/v2/comments._links.self'        => 'http://example.org/index.php?rest_route=/wp/v2/comments',
+		'Schema.routes./wp/v2/search._links.self'          => 'http://example.org/index.php?rest_route=/wp/v2/search',
 		'Schema.routes./wp/v2/settings._links.self'        => 'http://example.org/index.php?rest_route=/wp/v2/settings',
+		'Schema.routes./wp/v2/themes._links.self'          => 'http://example.org/index.php?rest_route=/wp/v2/themes',
 		'oembed.routes./oembed/1.0._links.self'            => 'http://example.org/index.php?rest_route=/oembed/1.0',
 		'oembed.routes./oembed/1.0/embed._links.self'      => 'http://example.org/index.php?rest_route=/oembed/1.0/embed',
 		'oembed.routes./oembed/1.0/proxy._links.self'      => 'http://example.org/index.php?rest_route=/oembed/1.0/proxy',
@@ -501,8 +504,8 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'PostsCollection.0._links.about.0.href'            => 'http://example.org/index.php?rest_route=/wp/v2/types/post',
 		'PostsCollection.0._links.replies.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=4',
 		'PostsCollection.0._links.version-history.0.href'  => 'http://example.org/index.php?rest_route=/wp/v2/posts/4/revisions',
-		'PostsCollection.0._links.predecessor-version.0.id' => 5,
-		'PostsCollection.0._links.predecessor-version.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/4/revisions/5',
+		'PostsCollection.0._links.predecessor-version.0.id' => 6,
+		'PostsCollection.0._links.predecessor-version.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts/4/revisions/6',
 		'PostsCollection.0._links.wp:attachment.0.href'    => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=4',
 		'PostsCollection.0._links.wp:term.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=4',
 		'PostsCollection.0._links.wp:term.1.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=4',
@@ -510,53 +513,87 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'PostModel.guid.rendered'                          => 'http://example.org/?p=4',
 		'PostModel.link'                                   => 'http://example.org/?p=4',
 		'postRevisions.0.author'                           => 2,
-		'postRevisions.0.id'                               => 5,
+		'postRevisions.0.id'                               => 6,
 		'postRevisions.0.parent'                           => 4,
-		'postRevisions.0.slug'                             => '4-revision-v1',
-		'postRevisions.0.guid.rendered'                    => 'http://example.org/?p=5',
+		'postRevisions.0.slug'                             => '4-autosave-v1',
+		'postRevisions.0.guid.rendered'                    => 'http://example.org/?p=6',
 		'postRevisions.0._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/posts/4',
+		'postRevisions.1.author'                           => 2,
+		'postRevisions.1.id'                               => 5,
+		'postRevisions.1.parent'                           => 4,
+		'postRevisions.1.slug'                             => '4-revision-v1',
+		'postRevisions.1.guid.rendered'                    => 'http://example.org/?p=5',
+		'postRevisions.1._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/posts/4',
 		'revision.author'                                  => 2,
 		'revision.id'                                      => 5,
 		'revision.parent'                                  => 4,
 		'revision.slug'                                    => '4-revision-v1',
 		'revision.guid.rendered'                           => 'http://example.org/?p=5',
-		'PagesCollection.0.id'                             => 6,
-		'PagesCollection.0.guid.rendered'                  => 'http://example.org/?page_id=6',
-		'PagesCollection.0.link'                           => 'http://example.org/?page_id=6',
-		'PagesCollection.0._links.self.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/6',
+		'postAutosaves.0.author'                           => 2,
+		'postAutosaves.0.id'                               => 6,
+		'postAutosaves.0.parent'                           => 4,
+		'postAutosaves.0.slug'                             => '4-autosave-v1',
+		'postAutosaves.0.guid.rendered'                    => 'http://example.org/?p=6',
+		'postAutosaves.0._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/posts/4',
+		'autosave.author'                                  => 2,
+		'autosave.id'                                      => 6,
+		'autosave.parent'                                  => 4,
+		'autosave.slug'                                    => '4-autosave-v1',
+		'autosave.guid.rendered'                           => 'http://example.org/?p=6',
+		'PagesCollection.0.id'                             => 7,
+		'PagesCollection.0.guid.rendered'                  => 'http://example.org/?page_id=7',
+		'PagesCollection.0.link'                           => 'http://example.org/?page_id=7',
+		'PagesCollection.0._links.self.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/7',
 		'PagesCollection.0._links.collection.0.href'       => 'http://example.org/index.php?rest_route=/wp/v2/pages',
 		'PagesCollection.0._links.about.0.href'            => 'http://example.org/index.php?rest_route=/wp/v2/types/page',
-		'PagesCollection.0._links.replies.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=6',
-		'PagesCollection.0._links.version-history.0.href'  => 'http://example.org/index.php?rest_route=/wp/v2/pages/6/revisions',
-		'PagesCollection.0._links.predecessor-version.0.id' => 7,
-		'PagesCollection.0._links.predecessor-version.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/6/revisions/7',
-		'PagesCollection.0._links.wp:attachment.0.href'    => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=6',
-		'PageModel.id'                                     => 6,
-		'PageModel.guid.rendered'                          => 'http://example.org/?page_id=6',
-		'PageModel.link'                                   => 'http://example.org/?page_id=6',
+		'PagesCollection.0._links.replies.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7',
+		'PagesCollection.0._links.version-history.0.href'  => 'http://example.org/index.php?rest_route=/wp/v2/pages/7/revisions',
+		'PagesCollection.0._links.predecessor-version.0.id' => 9,
+		'PagesCollection.0._links.predecessor-version.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/pages/7/revisions/9',
+		'PagesCollection.0._links.wp:attachment.0.href'    => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7',
+		'PageModel.id'                                     => 7,
+		'PageModel.guid.rendered'                          => 'http://example.org/?page_id=7',
+		'PageModel.link'                                   => 'http://example.org/?page_id=7',
 		'pageRevisions.0.author'                           => 2,
-		'pageRevisions.0.id'                               => 7,
-		'pageRevisions.0.parent'                           => 6,
-		'pageRevisions.0.slug'                             => '6-revision-v1',
-		'pageRevisions.0.guid.rendered'                    => 'http://example.org/?p=7',
-		'pageRevisions.0._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/6',
+		'pageRevisions.0.id'                               => 9,
+		'pageRevisions.0.parent'                           => 7,
+		'pageRevisions.0.slug'                             => '7-autosave-v1',
+		'pageRevisions.0.guid.rendered'                    => 'http://example.org/?p=9',
+		'pageRevisions.0._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/7',
+		'pageRevisions.1.author'                           => 2,
+		'pageRevisions.1.id'                               => 8,
+		'pageRevisions.1.parent'                           => 7,
+		'pageRevisions.1.slug'                             => '7-revision-v1',
+		'pageRevisions.1.guid.rendered'                    => 'http://example.org/?p=8',
+		'pageRevisions.1._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/7',
 		'pageRevision.author'                              => 2,
-		'pageRevision.id'                                  => 7,
-		'pageRevision.parent'                              => 6,
-		'pageRevision.slug'                                => '6-revision-v1',
-		'pageRevision.guid.rendered'                       => 'http://example.org/?p=7',
-		'MediaCollection.0.id'                             => 8,
-		'MediaCollection.0.guid.rendered'                  => 'http://example.org/?attachment_id=8',
-		'MediaCollection.0.link'                           => 'http://example.org/?attachment_id=8',
+		'pageRevision.id'                                  => 8,
+		'pageRevision.parent'                              => 7,
+		'pageRevision.slug'                                => '7-revision-v1',
+		'pageRevision.guid.rendered'                       => 'http://example.org/?p=8',
+		'pageAutosaves.0.author'                           => 2,
+		'pageAutosaves.0.id'                               => 9,
+		'pageAutosaves.0.parent'                           => 7,
+		'pageAutosaves.0.slug'                             => '7-autosave-v1',
+		'pageAutosaves.0.guid.rendered'                    => 'http://example.org/?p=9',
+		'pageAutosaves.0._links.parent.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/pages/7',
+		'pageAutosave.author'                              => 2,
+		'pageAutosave.id'                                  => 9,
+		'pageAutosave.parent'                              => 7,
+		'pageAutosave.slug'                                => '7-autosave-v1',
+		'pageAutosave.guid.rendered'                       => 'http://example.org/?p=9',
+		'MediaCollection.0.id'                             => 10,
+		'MediaCollection.0.guid.rendered'                  => 'http://example.org/?attachment_id=10',
+		'MediaCollection.0.link'                           => 'http://example.org/?attachment_id=10',
 		'MediaCollection.0.description.rendered'           => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
 		'MediaCollection.0.source_url'                     => 'http://example.org/wp-content/uploads//tmp/canola.jpg',
-		'MediaCollection.0._links.self.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/media/8',
+		'MediaCollection.0._links.self.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/media/10',
 		'MediaCollection.0._links.collection.0.href'       => 'http://example.org/index.php?rest_route=/wp/v2/media',
 		'MediaCollection.0._links.about.0.href'            => 'http://example.org/index.php?rest_route=/wp/v2/types/attachment',
-		'MediaCollection.0._links.replies.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=8',
-		'MediaModel.id'                                    => 8,
-		'MediaModel.guid.rendered'                         => 'http://example.org/?attachment_id=8',
-		'MediaModel.link'                                  => 'http://example.org/?attachment_id=8',
+		'MediaCollection.0._links.replies.0.href'          => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=10',
+		'MediaModel.id'                                    => 10,
+		'MediaModel.guid.rendered'                         => 'http://example.org/?attachment_id=10',
+		'MediaModel.link'                                  => 'http://example.org/?attachment_id=10',
 		'MediaModel.description.rendered'                  => '<p class="attachment"><!-- <a...><img.../></a> --></p>',
 		'MediaModel.source_url'                            => 'http://example.org/wp-content/uploads//tmp/canola.jpg',
 		'TypesCollection.post._links.collection.0.href'    => 'http://example.org/index.php?rest_route=/wp/v2/types',
@@ -565,6 +602,8 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'TypesCollection.page._links.wp:items.0.href'      => 'http://example.org/index.php?rest_route=/wp/v2/pages',
 		'TypesCollection.attachment._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types',
 		'TypesCollection.attachment._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/media',
+		'TypesCollection.wp_block._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/types',
+		'TypesCollection.wp_block._links.wp:items.0.href'  => 'http://example.org/index.php?rest_route=/wp/v2/blocks',
 		'StatusesCollection.publish._links.archives.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/posts',
 		'StatusesCollection.future._links.archives.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=future',
 		'StatusesCollection.draft._links.archives.0.href'  => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&status=draft',
@@ -576,19 +615,33 @@ class WP_Test_REST_Schema_Initialization extends WP_Test_REST_TestCase {
 		'TaxonomiesCollection.post_tag._links.collection.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies',
 		'TaxonomiesCollection.post_tag._links.wp:items.0.href' => 'http://example.org/index.php?rest_route=/wp/v2/tags',
 		'CategoriesCollection.0.link'                      => 'http://example.org/?cat=1',
+		'CategoriesCollection.0.meta.test_single'          => '',
+		'CategoriesCollection.0.meta.test_multi'           => [],
+		'CategoriesCollection.0.meta.test_cat_single'      => '',
+		'CategoriesCollection.0.meta.test_cat_multi'       => [],
 		'CategoriesCollection.0._links.self.0.href'        => 'http://example.org/index.php?rest_route=/wp/v2/categories/1',
 		'CategoriesCollection.0._links.collection.0.href'  => 'http://example.org/index.php?rest_route=/wp/v2/categories',
 		'CategoriesCollection.0._links.about.0.href'       => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies/category',
 		'CategoriesCollection.0._links.wp:post_type.0.href' => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&categories=1',
 		'CategoryModel.link'                               => 'http://example.org/?cat=1',
+		'CategoryModel.meta.test_single'                   => '',
+		'CategoryModel.meta.test_multi'                    => [],
+		'CategoryModel.meta.test_cat_single'               => '',
+		'CategoryModel.meta.test_cat_multi'                => [],
 		'TagsCollection.0.id'                              => 2,
 		'TagsCollection.0.link'                            => 'http://example.org/?tag=restapi-client-fixture-tag',
+		'TagsCollection.0.meta.test_single'                => '',
+		'TagsCollection.0.meta.test_multi'                 => [],
+		'TagsCollection.0.meta.test_tag_meta'              => '',
 		'TagsCollection.0._links.self.0.href'              => 'http://example.org/index.php?rest_route=/wp/v2/tags/2',
 		'TagsCollection.0._links.collection.0.href'        => 'http://example.org/index.php?rest_route=/wp/v2/tags',
 		'TagsCollection.0._links.about.0.href'             => 'http://example.org/index.php?rest_route=/wp/v2/taxonomies/post_tag',
 		'TagsCollection.0._links.wp:post_type.0.href'      => 'http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fposts&tags=2',
 		'TagModel.id'                                      => 2,
 		'TagModel.link'                                    => 'http://example.org/?tag=restapi-client-fixture-tag',
+		'TagModel.meta.test_single'                        => '',
+		'TagModel.meta.test_multi'                         => [],
+		'TagModel.meta.test_tag_meta'                      => '',
 		'UsersCollection.0.link'                           => 'http://example.org/?author=1',
 		'UsersCollection.0.avatar_urls.24'                 => 'http://0.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=24&d=mm&r=g',
 		'UsersCollection.0.avatar_urls.48'                 => 'http://0.gravatar.com/avatar/96614ec98aa0c0d2ee75796dced6df54?s=48&d=mm&r=g',
diff --git a/tests/qunit/fixtures/wp-api-generated.js b/tests/qunit/fixtures/wp-api-generated.js
index 44e518bf28..4ac2d6739e 100644
--- a/tests/qunit/fixtures/wp-api-generated.js
+++ b/tests/qunit/fixtures/wp-api-generated.js
@@ -4980,8 +4980,8 @@ mockedApiResponse.PostsCollection = [
             ],
             "predecessor-version": [
                 {
-                    "id": 5,
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/4/revisions/5"
+                    "id": 6,
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/4/revisions/6"
                 }
             ],
             "wp:attachment": [
@@ -5057,13 +5057,13 @@ mockedApiResponse.postRevisions = [
         "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 5,
+        "id": 6,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
         "parent": 4,
-        "slug": "4-revision-v1",
+        "slug": "4-autosave-v1",
         "guid": {
-            "rendered": "http://example.org/?p=5"
+            "rendered": "http://example.org/?p=6"
         },
         "title": {
             "rendered": ""
@@ -5083,16 +5083,16 @@ mockedApiResponse.postRevisions = [
         }
     },
     {
-        "author": 376,
+        "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 36744,
+        "id": 5,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
-        "parent": 36743,
-        "slug": "36743-revision-v1",
+        "parent": 4,
+        "slug": "4-revision-v1",
         "guid": {
-            "rendered": "http://example.org/?p=36744"
+            "rendered": "http://example.org/?p=5"
         },
         "title": {
             "rendered": "REST API Client Fixture: Post"
@@ -5106,7 +5106,7 @@ mockedApiResponse.postRevisions = [
         "_links": {
             "parent": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/36743"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/4"
                 }
             ]
         }
@@ -5138,16 +5138,16 @@ mockedApiResponse.revision = {
 
 mockedApiResponse.postAutosaves = [
     {
-        "author": 376,
+        "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 36745,
+        "id": 6,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
-        "parent": 36743,
-        "slug": "36743-autosave-v1",
+        "parent": 4,
+        "slug": "4-autosave-v1",
         "guid": {
-            "rendered": "http://example.org/?p=36745"
+            "rendered": "http://example.org/?p=6"
         },
         "title": {
             "rendered": ""
@@ -5161,7 +5161,7 @@ mockedApiResponse.postAutosaves = [
         "_links": {
             "parent": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/36743"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/posts/4"
                 }
             ]
         }
@@ -5169,16 +5169,16 @@ mockedApiResponse.postAutosaves = [
 ];
 
 mockedApiResponse.autosave = {
-    "author": 376,
+    "author": 2,
     "date": "2017-02-14T00:00:00",
     "date_gmt": "2017-02-14T00:00:00",
-    "id": 36745,
+    "id": 6,
     "modified": "2017-02-14T00:00:00",
     "modified_gmt": "2017-02-14T00:00:00",
-    "parent": 36743,
-    "slug": "36743-autosave-v1",
+    "parent": 4,
+    "slug": "4-autosave-v1",
     "guid": {
-        "rendered": "http://example.org/?p=36745"
+        "rendered": "http://example.org/?p=6"
     },
     "title": {
         "rendered": ""
@@ -5193,18 +5193,18 @@ mockedApiResponse.autosave = {
 
 mockedApiResponse.PagesCollection = [
     {
-        "id": 6,
+        "id": 7,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
         "guid": {
-            "rendered": "http://example.org/?page_id=6"
+            "rendered": "http://example.org/?page_id=7"
         },
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
         "slug": "restapi-client-fixture-page",
         "status": "publish",
         "type": "page",
-        "link": "http://example.org/?page_id=6",
+        "link": "http://example.org/?page_id=7",
         "title": {
             "rendered": "REST API Client Fixture: Page"
         },
@@ -5229,7 +5229,7 @@ mockedApiResponse.PagesCollection = [
         "_links": {
             "self": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/6"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7"
                 }
             ],
             "collection": [
@@ -5245,24 +5245,24 @@ mockedApiResponse.PagesCollection = [
             "replies": [
                 {
                     "embeddable": true,
-                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=6"
+                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=7"
                 }
             ],
             "version-history": [
                 {
                     "count": 2,
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/6/revisions"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7/revisions"
                 }
             ],
             "predecessor-version": [
                 {
-                    "id": 7,
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/6/revisions/7"
+                    "id": 9,
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7/revisions/9"
                 }
             ],
             "wp:attachment": [
                 {
-                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=6"
+                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=7"
                 }
             ],
             "curies": [
@@ -5277,18 +5277,18 @@ mockedApiResponse.PagesCollection = [
 ];
 
 mockedApiResponse.PageModel = {
-    "id": 6,
+    "id": 7,
     "date": "2017-02-14T00:00:00",
     "date_gmt": "2017-02-14T00:00:00",
     "guid": {
-        "rendered": "http://example.org/?page_id=6"
+        "rendered": "http://example.org/?page_id=7"
     },
     "modified": "2017-02-14T00:00:00",
     "modified_gmt": "2017-02-14T00:00:00",
     "slug": "restapi-client-fixture-page",
     "status": "publish",
     "type": "page",
-    "link": "http://example.org/?page_id=6",
+    "link": "http://example.org/?page_id=7",
     "title": {
         "rendered": "REST API Client Fixture: Page"
     },
@@ -5317,13 +5317,13 @@ mockedApiResponse.pageRevisions = [
         "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 7,
+        "id": 9,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
-        "parent": 6,
-        "slug": "6-revision-v1",
+        "parent": 7,
+        "slug": "7-autosave-v1",
         "guid": {
-            "rendered": "http://example.org/?p=7"
+            "rendered": "http://example.org/?p=9"
         },
         "title": {
             "rendered": ""
@@ -5337,22 +5337,22 @@ mockedApiResponse.pageRevisions = [
         "_links": {
             "parent": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/6"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7"
                 }
             ]
         }
     },
     {
-        "author": 376,
+        "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 36747,
+        "id": 8,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
-        "parent": 36746,
-        "slug": "36746-revision-v1",
+        "parent": 7,
+        "slug": "7-revision-v1",
         "guid": {
-            "rendered": "http://example.org/?p=36747"
+            "rendered": "http://example.org/?p=8"
         },
         "title": {
             "rendered": "REST API Client Fixture: Page"
@@ -5366,7 +5366,7 @@ mockedApiResponse.pageRevisions = [
         "_links": {
             "parent": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/36746"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7"
                 }
             ]
         }
@@ -5377,13 +5377,13 @@ mockedApiResponse.pageRevision = {
     "author": 2,
     "date": "2017-02-14T00:00:00",
     "date_gmt": "2017-02-14T00:00:00",
-    "id": 7,
+    "id": 8,
     "modified": "2017-02-14T00:00:00",
     "modified_gmt": "2017-02-14T00:00:00",
-    "parent": 6,
-    "slug": "6-revision-v1",
+    "parent": 7,
+    "slug": "7-revision-v1",
     "guid": {
-        "rendered": "http://example.org/?p=7"
+        "rendered": "http://example.org/?p=8"
     },
     "title": {
         "rendered": "REST API Client Fixture: Page"
@@ -5398,16 +5398,16 @@ mockedApiResponse.pageRevision = {
 
 mockedApiResponse.pageAutosaves = [
     {
-        "author": 376,
+        "author": 2,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
-        "id": 36748,
+        "id": 9,
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
-        "parent": 36746,
-        "slug": "36746-autosave-v1",
+        "parent": 7,
+        "slug": "7-autosave-v1",
         "guid": {
-            "rendered": "http://example.org/?p=36748"
+            "rendered": "http://example.org/?p=9"
         },
         "title": {
             "rendered": ""
@@ -5421,7 +5421,7 @@ mockedApiResponse.pageAutosaves = [
         "_links": {
             "parent": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/36746"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/pages/7"
                 }
             ]
         }
@@ -5429,16 +5429,16 @@ mockedApiResponse.pageAutosaves = [
 ];
 
 mockedApiResponse.pageAutosave = {
-    "author": 376,
+    "author": 2,
     "date": "2017-02-14T00:00:00",
     "date_gmt": "2017-02-14T00:00:00",
-    "id": 36748,
+    "id": 9,
     "modified": "2017-02-14T00:00:00",
     "modified_gmt": "2017-02-14T00:00:00",
-    "parent": 36746,
-    "slug": "36746-autosave-v1",
+    "parent": 7,
+    "slug": "7-autosave-v1",
     "guid": {
-        "rendered": "http://example.org/?p=36748"
+        "rendered": "http://example.org/?p=9"
     },
     "title": {
         "rendered": ""
@@ -5453,18 +5453,18 @@ mockedApiResponse.pageAutosave = {
 
 mockedApiResponse.MediaCollection = [
     {
-        "id": 8,
+        "id": 10,
         "date": "2017-02-14T00:00:00",
         "date_gmt": "2017-02-14T00:00:00",
         "guid": {
-            "rendered": "http://example.org/?attachment_id=8"
+            "rendered": "http://example.org/?attachment_id=10"
         },
         "modified": "2017-02-14T00:00:00",
         "modified_gmt": "2017-02-14T00:00:00",
         "slug": "restapi-client-fixture-attachment",
         "status": "inherit",
         "type": "attachment",
-        "link": "http://example.org/?attachment_id=8",
+        "link": "http://example.org/?attachment_id=10",
         "title": {
             "rendered": "REST API Client Fixture: Attachment"
         },
@@ -5490,7 +5490,7 @@ mockedApiResponse.MediaCollection = [
         "_links": {
             "self": [
                 {
-                    "href": "http://example.org/index.php?rest_route=/wp/v2/media/8"
+                    "href": "http://example.org/index.php?rest_route=/wp/v2/media/10"
                 }
             ],
             "collection": [
@@ -5506,7 +5506,7 @@ mockedApiResponse.MediaCollection = [
             "replies": [
                 {
                     "embeddable": true,
-                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=8"
+                    "href": "http://example.org/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=10"
                 }
             ]
         }
@@ -5514,18 +5514,18 @@ mockedApiResponse.MediaCollection = [
 ];
 
 mockedApiResponse.MediaModel = {
-    "id": 8,
+    "id": 10,
     "date": "2017-02-14T00:00:00",
     "date_gmt": "2017-02-14T00:00:00",
     "guid": {
-        "rendered": "http://example.org/?attachment_id=8"
+        "rendered": "http://example.org/?attachment_id=10"
     },
     "modified": "2017-02-14T00:00:00",
     "modified_gmt": "2017-02-14T00:00:00",
     "slug": "restapi-client-fixture-attachment",
     "status": "inherit",
     "type": "attachment",
-    "link": "http://example.org/?attachment_id=8",
+    "link": "http://example.org/?attachment_id=10",
     "title": {
         "rendered": "REST API Client Fixture: Attachment"
     },