diff --git a/blocks/test/fixtures/core-embed__animoto.parsed.json b/blocks/test/fixtures/core-embed__animoto.parsed.json
index 1434f5a194160..2b8aa2d88f7c5 100644
--- a/blocks/test/fixtures/core-embed__animoto.parsed.json
+++ b/blocks/test/fixtures/core-embed__animoto.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://animoto.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-animoto\">\n    https://animoto.com/\n    <figcaption>Embedded content from animoto</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-animoto\">\n    https://animoto.com/\n    <figcaption>Embedded content from animoto</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__cloudup.parsed.json b/blocks/test/fixtures/core-embed__cloudup.parsed.json
index 6158419a9e6c4..ed7537b520d3e 100644
--- a/blocks/test/fixtures/core-embed__cloudup.parsed.json
+++ b/blocks/test/fixtures/core-embed__cloudup.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://cloudup.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-cloudup\">\n    https://cloudup.com/\n    <figcaption>Embedded content from cloudup</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-cloudup\">\n    https://cloudup.com/\n    <figcaption>Embedded content from cloudup</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__collegehumor.parsed.json b/blocks/test/fixtures/core-embed__collegehumor.parsed.json
index 42043c2c075a1..79ce348238de0 100644
--- a/blocks/test/fixtures/core-embed__collegehumor.parsed.json
+++ b/blocks/test/fixtures/core-embed__collegehumor.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://collegehumor.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-collegehumor\">\n    https://collegehumor.com/\n    <figcaption>Embedded content from collegehumor</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-collegehumor\">\n    https://collegehumor.com/\n    <figcaption>Embedded content from collegehumor</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__dailymotion.parsed.json b/blocks/test/fixtures/core-embed__dailymotion.parsed.json
index 6f1b1710e709a..6ce59d409c282 100644
--- a/blocks/test/fixtures/core-embed__dailymotion.parsed.json
+++ b/blocks/test/fixtures/core-embed__dailymotion.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://dailymotion.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-dailymotion\">\n    https://dailymotion.com/\n    <figcaption>Embedded content from dailymotion</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-dailymotion\">\n    https://dailymotion.com/\n    <figcaption>Embedded content from dailymotion</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__facebook.parsed.json b/blocks/test/fixtures/core-embed__facebook.parsed.json
index 9da534f088054..2a6fa4cfea730 100644
--- a/blocks/test/fixtures/core-embed__facebook.parsed.json
+++ b/blocks/test/fixtures/core-embed__facebook.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://facebook.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-facebook\">\n    https://facebook.com/\n    <figcaption>Embedded content from facebook</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-facebook\">\n    https://facebook.com/\n    <figcaption>Embedded content from facebook</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__flickr.parsed.json b/blocks/test/fixtures/core-embed__flickr.parsed.json
index ef0e13c84268c..5051067f7ba6d 100644
--- a/blocks/test/fixtures/core-embed__flickr.parsed.json
+++ b/blocks/test/fixtures/core-embed__flickr.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://flickr.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-flickr\">\n    https://flickr.com/\n    <figcaption>Embedded content from flickr</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-flickr\">\n    https://flickr.com/\n    <figcaption>Embedded content from flickr</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__funnyordie.parsed.json b/blocks/test/fixtures/core-embed__funnyordie.parsed.json
index b454be8ed4921..7d45fb60fabef 100644
--- a/blocks/test/fixtures/core-embed__funnyordie.parsed.json
+++ b/blocks/test/fixtures/core-embed__funnyordie.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://funnyordie.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-funnyordie\">\n    https://funnyordie.com/\n    <figcaption>Embedded content from funnyordie</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-funnyordie\">\n    https://funnyordie.com/\n    <figcaption>Embedded content from funnyordie</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__hulu.parsed.json b/blocks/test/fixtures/core-embed__hulu.parsed.json
index 25f330719a4bb..4e1ec5d19d845 100644
--- a/blocks/test/fixtures/core-embed__hulu.parsed.json
+++ b/blocks/test/fixtures/core-embed__hulu.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://hulu.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-hulu\">\n    https://hulu.com/\n    <figcaption>Embedded content from hulu</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-hulu\">\n    https://hulu.com/\n    <figcaption>Embedded content from hulu</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__imgur.parsed.json b/blocks/test/fixtures/core-embed__imgur.parsed.json
index efcd6e5486e99..41a20e74b0de3 100644
--- a/blocks/test/fixtures/core-embed__imgur.parsed.json
+++ b/blocks/test/fixtures/core-embed__imgur.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://imgur.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-imgur\">\n    https://imgur.com/\n    <figcaption>Embedded content from imgur</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-imgur\">\n    https://imgur.com/\n    <figcaption>Embedded content from imgur</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__instagram.parsed.json b/blocks/test/fixtures/core-embed__instagram.parsed.json
index 176ed88d98b18..fe59d87b7ca5e 100644
--- a/blocks/test/fixtures/core-embed__instagram.parsed.json
+++ b/blocks/test/fixtures/core-embed__instagram.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://instagram.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-instagram\">\n    https://instagram.com/\n    <figcaption>Embedded content from instagram</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-instagram\">\n    https://instagram.com/\n    <figcaption>Embedded content from instagram</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__issuu.parsed.json b/blocks/test/fixtures/core-embed__issuu.parsed.json
index d735331c9d671..9cef9d0d043b2 100644
--- a/blocks/test/fixtures/core-embed__issuu.parsed.json
+++ b/blocks/test/fixtures/core-embed__issuu.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://issuu.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-issuu\">\n    https://issuu.com/\n    <figcaption>Embedded content from issuu</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-issuu\">\n    https://issuu.com/\n    <figcaption>Embedded content from issuu</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__kickstarter.parsed.json b/blocks/test/fixtures/core-embed__kickstarter.parsed.json
index 7423a14cc8b7b..f7290d4ac30ec 100644
--- a/blocks/test/fixtures/core-embed__kickstarter.parsed.json
+++ b/blocks/test/fixtures/core-embed__kickstarter.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://kickstarter.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-kickstarter\">\n    https://kickstarter.com/\n    <figcaption>Embedded content from kickstarter</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-kickstarter\">\n    https://kickstarter.com/\n    <figcaption>Embedded content from kickstarter</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__meetup-com.parsed.json b/blocks/test/fixtures/core-embed__meetup-com.parsed.json
index a9a47366215d7..fa49ecffa1273 100644
--- a/blocks/test/fixtures/core-embed__meetup-com.parsed.json
+++ b/blocks/test/fixtures/core-embed__meetup-com.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://meetup.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-meetup-com\">\n    https://meetup.com/\n    <figcaption>Embedded content from meetup-com</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-meetup-com\">\n    https://meetup.com/\n    <figcaption>Embedded content from meetup-com</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__mixcloud.parsed.json b/blocks/test/fixtures/core-embed__mixcloud.parsed.json
index a06b788c5c30b..b4d5c1a27c1a6 100644
--- a/blocks/test/fixtures/core-embed__mixcloud.parsed.json
+++ b/blocks/test/fixtures/core-embed__mixcloud.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://mixcloud.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-mixcloud\">\n    https://mixcloud.com/\n    <figcaption>Embedded content from mixcloud</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-mixcloud\">\n    https://mixcloud.com/\n    <figcaption>Embedded content from mixcloud</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__photobucket.parsed.json b/blocks/test/fixtures/core-embed__photobucket.parsed.json
index 57b249b092f80..baca8f12cc945 100644
--- a/blocks/test/fixtures/core-embed__photobucket.parsed.json
+++ b/blocks/test/fixtures/core-embed__photobucket.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://photobucket.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-photobucket\">\n    https://photobucket.com/\n    <figcaption>Embedded content from photobucket</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-photobucket\">\n    https://photobucket.com/\n    <figcaption>Embedded content from photobucket</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__polldaddy.parsed.json b/blocks/test/fixtures/core-embed__polldaddy.parsed.json
index 63f4d26eb217e..73be3b1f44561 100644
--- a/blocks/test/fixtures/core-embed__polldaddy.parsed.json
+++ b/blocks/test/fixtures/core-embed__polldaddy.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://polldaddy.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-polldaddy\">\n    https://polldaddy.com/\n    <figcaption>Embedded content from polldaddy</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-polldaddy\">\n    https://polldaddy.com/\n    <figcaption>Embedded content from polldaddy</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__reddit.parsed.json b/blocks/test/fixtures/core-embed__reddit.parsed.json
index 2f1270472a2ee..c45d3cb7a2505 100644
--- a/blocks/test/fixtures/core-embed__reddit.parsed.json
+++ b/blocks/test/fixtures/core-embed__reddit.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://reddit.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-reddit\">\n    https://reddit.com/\n    <figcaption>Embedded content from reddit</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-reddit\">\n    https://reddit.com/\n    <figcaption>Embedded content from reddit</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__reverbnation.parsed.json b/blocks/test/fixtures/core-embed__reverbnation.parsed.json
index 0f56364595f64..d12a468a1c2ea 100644
--- a/blocks/test/fixtures/core-embed__reverbnation.parsed.json
+++ b/blocks/test/fixtures/core-embed__reverbnation.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://reverbnation.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-reverbnation\">\n    https://reverbnation.com/\n    <figcaption>Embedded content from reverbnation</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-reverbnation\">\n    https://reverbnation.com/\n    <figcaption>Embedded content from reverbnation</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__screencast.parsed.json b/blocks/test/fixtures/core-embed__screencast.parsed.json
index 161a2523be697..64b26d8d6264c 100644
--- a/blocks/test/fixtures/core-embed__screencast.parsed.json
+++ b/blocks/test/fixtures/core-embed__screencast.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://screencast.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-screencast\">\n    https://screencast.com/\n    <figcaption>Embedded content from screencast</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-screencast\">\n    https://screencast.com/\n    <figcaption>Embedded content from screencast</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__scribd.parsed.json b/blocks/test/fixtures/core-embed__scribd.parsed.json
index 6b99d3fd3dc50..9714fd803e205 100644
--- a/blocks/test/fixtures/core-embed__scribd.parsed.json
+++ b/blocks/test/fixtures/core-embed__scribd.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://scribd.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-scribd\">\n    https://scribd.com/\n    <figcaption>Embedded content from scribd</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-scribd\">\n    https://scribd.com/\n    <figcaption>Embedded content from scribd</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__slideshare.parsed.json b/blocks/test/fixtures/core-embed__slideshare.parsed.json
index 807657a9f61db..e18f359b3c5e6 100644
--- a/blocks/test/fixtures/core-embed__slideshare.parsed.json
+++ b/blocks/test/fixtures/core-embed__slideshare.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://slideshare.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-slideshare\">\n    https://slideshare.com/\n    <figcaption>Embedded content from slideshare</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-slideshare\">\n    https://slideshare.com/\n    <figcaption>Embedded content from slideshare</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__smugmug.parsed.json b/blocks/test/fixtures/core-embed__smugmug.parsed.json
index 7dc3c5ff98ace..3d2f3e7ec8273 100644
--- a/blocks/test/fixtures/core-embed__smugmug.parsed.json
+++ b/blocks/test/fixtures/core-embed__smugmug.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://smugmug.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-smugmug\">\n    https://smugmug.com/\n    <figcaption>Embedded content from smugmug</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-smugmug\">\n    https://smugmug.com/\n    <figcaption>Embedded content from smugmug</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__soundcloud.parsed.json b/blocks/test/fixtures/core-embed__soundcloud.parsed.json
index 18fa2bcbcea15..0bfc23b319d7d 100644
--- a/blocks/test/fixtures/core-embed__soundcloud.parsed.json
+++ b/blocks/test/fixtures/core-embed__soundcloud.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://soundcloud.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-soundcloud\">\n    https://soundcloud.com/\n    <figcaption>Embedded content from soundcloud</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-soundcloud\">\n    https://soundcloud.com/\n    <figcaption>Embedded content from soundcloud</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__speaker.parsed.json b/blocks/test/fixtures/core-embed__speaker.parsed.json
index d3706252dba22..5770952f8f401 100644
--- a/blocks/test/fixtures/core-embed__speaker.parsed.json
+++ b/blocks/test/fixtures/core-embed__speaker.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://speaker.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-speaker\">\n    https://speaker.com/\n    <figcaption>Embedded content from speaker</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-speaker\">\n    https://speaker.com/\n    <figcaption>Embedded content from speaker</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__spotify.parsed.json b/blocks/test/fixtures/core-embed__spotify.parsed.json
index 8e1c003accf20..4a1eabbe74d2c 100644
--- a/blocks/test/fixtures/core-embed__spotify.parsed.json
+++ b/blocks/test/fixtures/core-embed__spotify.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://spotify.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-spotify\">\n    https://spotify.com/\n    <figcaption>Embedded content from spotify</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-spotify\">\n    https://spotify.com/\n    <figcaption>Embedded content from spotify</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__ted.parsed.json b/blocks/test/fixtures/core-embed__ted.parsed.json
index e5efedff44f78..fb32e6b20bed4 100644
--- a/blocks/test/fixtures/core-embed__ted.parsed.json
+++ b/blocks/test/fixtures/core-embed__ted.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://ted.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-ted\">\n    https://ted.com/\n    <figcaption>Embedded content from ted</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-ted\">\n    https://ted.com/\n    <figcaption>Embedded content from ted</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__tumblr.parsed.json b/blocks/test/fixtures/core-embed__tumblr.parsed.json
index 0e52df77fc118..413efd5ae080a 100644
--- a/blocks/test/fixtures/core-embed__tumblr.parsed.json
+++ b/blocks/test/fixtures/core-embed__tumblr.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://tumblr.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-tumblr\">\n    https://tumblr.com/\n    <figcaption>Embedded content from tumblr</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-tumblr\">\n    https://tumblr.com/\n    <figcaption>Embedded content from tumblr</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__twitter.parsed.json b/blocks/test/fixtures/core-embed__twitter.parsed.json
index a916a2e5a579b..bb1708320934b 100644
--- a/blocks/test/fixtures/core-embed__twitter.parsed.json
+++ b/blocks/test/fixtures/core-embed__twitter.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://twitter.com/automattic"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-twitter\">\n    https://twitter.com/automattic\n    <figcaption>We are Automattic</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-twitter\">\n    https://twitter.com/automattic\n    <figcaption>We are Automattic</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__videopress.parsed.json b/blocks/test/fixtures/core-embed__videopress.parsed.json
index 6edc6abacf7a1..3aacf9fb98b85 100644
--- a/blocks/test/fixtures/core-embed__videopress.parsed.json
+++ b/blocks/test/fixtures/core-embed__videopress.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://videopress.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-videopress\">\n    https://videopress.com/\n    <figcaption>Embedded content from videopress</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-videopress\">\n    https://videopress.com/\n    <figcaption>Embedded content from videopress</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__vimeo.parsed.json b/blocks/test/fixtures/core-embed__vimeo.parsed.json
index 4e9f44b2dfaef..17d7b985d45c9 100644
--- a/blocks/test/fixtures/core-embed__vimeo.parsed.json
+++ b/blocks/test/fixtures/core-embed__vimeo.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://vimeo.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-vimeo\">\n    https://vimeo.com/\n    <figcaption>Embedded content from vimeo</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-vimeo\">\n    https://vimeo.com/\n    <figcaption>Embedded content from vimeo</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__vine.parsed.json b/blocks/test/fixtures/core-embed__vine.parsed.json
index e303b9b6a84d8..cb45d11f7d072 100644
--- a/blocks/test/fixtures/core-embed__vine.parsed.json
+++ b/blocks/test/fixtures/core-embed__vine.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://vine.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-vine\">\n    https://vine.com/\n    <figcaption>Embedded content from vine</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-vine\">\n    https://vine.com/\n    <figcaption>Embedded content from vine</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__wordpress-tv.parsed.json b/blocks/test/fixtures/core-embed__wordpress-tv.parsed.json
index 048c0de82665d..951850ff212e0 100644
--- a/blocks/test/fixtures/core-embed__wordpress-tv.parsed.json
+++ b/blocks/test/fixtures/core-embed__wordpress-tv.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://wordpress.tv/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-wordpress-tv\">\n    https://wordpress.tv/\n    <figcaption>Embedded content from wordpress-tv</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-wordpress-tv\">\n    https://wordpress.tv/\n    <figcaption>Embedded content from wordpress-tv</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__wordpress.parsed.json b/blocks/test/fixtures/core-embed__wordpress.parsed.json
index e44c88cd354c9..1d20c2415a6e9 100644
--- a/blocks/test/fixtures/core-embed__wordpress.parsed.json
+++ b/blocks/test/fixtures/core-embed__wordpress.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://wordpress.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-wordpress\">\n    https://wordpress.com/\n    <figcaption>Embedded content from WordPress</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-wordpress\">\n    https://wordpress.com/\n    <figcaption>Embedded content from WordPress</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core-embed__youtube.parsed.json b/blocks/test/fixtures/core-embed__youtube.parsed.json
index 343311d1986cb..133f3472799e2 100644
--- a/blocks/test/fixtures/core-embed__youtube.parsed.json
+++ b/blocks/test/fixtures/core-embed__youtube.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://youtube.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed-youtube\">\n    https://youtube.com/\n    <figcaption>Embedded content from youtube</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed-youtube\">\n    https://youtube.com/\n    <figcaption>Embedded content from youtube</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__audio.parsed.json b/blocks/test/fixtures/core__audio.parsed.json
index 1066d69b9570b..4a2dca2b9a4ae 100644
--- a/blocks/test/fixtures/core__audio.parsed.json
+++ b/blocks/test/fixtures/core__audio.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "align": "right"
         },
-        "rawContent": "\n<div class=\"wp-block-audio alignright\">\n    <audio controls=\"\" src=\"https://media.simplecast.com/episodes/audio/80564/draft-podcast-51-livePublish2.mp3\"></audio>\n</div>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<div class=\"wp-block-audio alignright\">\n    <audio controls=\"\" src=\"https://media.simplecast.com/episodes/audio/80564/draft-podcast-51-livePublish2.mp3\"></audio>\n</div>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__button__center.parsed.json b/blocks/test/fixtures/core__button__center.parsed.json
index a96bf42cf9a48..b86209ec82806 100644
--- a/blocks/test/fixtures/core__button__center.parsed.json
+++ b/blocks/test/fixtures/core__button__center.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "align": "center"
         },
-        "rawContent": "\n<div class=\"wp-block-button aligncenter\"><a href=\"https://github.com/WordPress/gutenberg\">Help build Gutenberg</a></div>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<div class=\"wp-block-button aligncenter\"><a href=\"https://github.com/WordPress/gutenberg\">Help build Gutenberg</a></div>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__categories.parsed.json b/blocks/test/fixtures/core__categories.parsed.json
index 389788dbf0b38..c21c72b4d6f1f 100644
--- a/blocks/test/fixtures/core__categories.parsed.json
+++ b/blocks/test/fixtures/core__categories.parsed.json
@@ -6,10 +6,11 @@
             "displayAsDropdown": false,
             "showHierarchy": false
         },
-        "rawContent": ""
+        "innerBlocks": [],
+        "innerHtml": ""
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__code.parsed.json b/blocks/test/fixtures/core__code.parsed.json
index 127ba413fcb3c..882e661e882b2 100644
--- a/blocks/test/fixtures/core__code.parsed.json
+++ b/blocks/test/fixtures/core__code.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/code",
         "attrs": null,
-        "rawContent": "\n<pre class=\"wp-block-code\"><code>export default function MyButton() {\n\treturn &lt;Button&gt;Click Me!&lt;/Button&gt;;\n}</code></pre>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<pre class=\"wp-block-code\"><code>export default function MyButton() {\n\treturn &lt;Button&gt;Click Me!&lt;/Button&gt;;\n}</code></pre>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__cover-image.parsed.json b/blocks/test/fixtures/core__cover-image.parsed.json
index 9d337ce943ef1..066ba2bf48571 100644
--- a/blocks/test/fixtures/core__cover-image.parsed.json
+++ b/blocks/test/fixtures/core__cover-image.parsed.json
@@ -5,10 +5,11 @@
             "url": "https://cldup.com/uuUqE_dXzy.jpg",
             "dimRatio": 40
         },
-        "rawContent": "\n<section class=\"wp-block-cover-image has-background-dim-40 has-background-dim\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg);\">\n    <h2>Guten Berg!</h2>\n</section>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<section class=\"wp-block-cover-image has-background-dim-40 has-background-dim\" style=\"background-image:url(https://cldup.com/uuUqE_dXzy.jpg);\">\n    <h2>Guten Berg!</h2>\n</section>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__embed.parsed.json b/blocks/test/fixtures/core__embed.parsed.json
index d0b20272ef818..af3a942e2a261 100644
--- a/blocks/test/fixtures/core__embed.parsed.json
+++ b/blocks/test/fixtures/core__embed.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "url": "https://example.com/"
         },
-        "rawContent": "\n<figure class=\"wp-block-embed\">\n    https://example.com/\n    <figcaption>Embedded content from an example URL</figcaption>\n</figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-embed\">\n    https://example.com/\n    <figcaption>Embedded content from an example URL</figcaption>\n</figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__freeform.parsed.json b/blocks/test/fixtures/core__freeform.parsed.json
index 276442f4c7864..c46709ce1379a 100644
--- a/blocks/test/fixtures/core__freeform.parsed.json
+++ b/blocks/test/fixtures/core__freeform.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/freeform",
         "attrs": null,
-        "rawContent": "\nTesting freeform block with some\n<div class=\"wp-some-class\">\n\tHTML <span style=\"color: red;\">content</span>\n</div>\n"
+        "innerBlocks": [],
+        "innerHtml": "\nTesting freeform block with some\n<div class=\"wp-some-class\">\n\tHTML <span style=\"color: red;\">content</span>\n</div>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__gallery.parsed.json b/blocks/test/fixtures/core__gallery.parsed.json
index 31f38109c032b..cb0823ae9440b 100644
--- a/blocks/test/fixtures/core__gallery.parsed.json
+++ b/blocks/test/fixtures/core__gallery.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/gallery",
         "attrs": null,
-        "rawContent": "\n<div class=\"wp-block-gallery\">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"title\" />\n\t</figure>\n</div>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<div class=\"wp-block-gallery\">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"title\" />\n\t</figure>\n</div>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__gallery__columns.parsed.json b/blocks/test/fixtures/core__gallery__columns.parsed.json
index a17f139ec74e9..0d9a2bcaacb86 100644
--- a/blocks/test/fixtures/core__gallery__columns.parsed.json
+++ b/blocks/test/fixtures/core__gallery__columns.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "columns": "1"
         },
-        "rawContent": "\n<div class=\"wp-block-gallery columns-1 \">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"title\" />\n\t</figure>\n</div>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<div class=\"wp-block-gallery columns-1 \">\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"https://cldup.com/uuUqE_dXzy.jpg\" alt=\"title\" />\n\t</figure>\n\t<figure class=\"blocks-gallery-image\">\n\t\t<img src=\"http://google.com/hi.png\" alt=\"title\" />\n\t</figure>\n</div>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__heading__h2-em.parsed.json b/blocks/test/fixtures/core__heading__h2-em.parsed.json
index 3920297cb1ac9..101695e7b3ec0 100644
--- a/blocks/test/fixtures/core__heading__h2-em.parsed.json
+++ b/blocks/test/fixtures/core__heading__h2-em.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/heading",
         "attrs": null,
-        "rawContent": "\n<h2>The <em>Inserter</em> Tool</h2>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<h2>The <em>Inserter</em> Tool</h2>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__heading__h2.parsed.json b/blocks/test/fixtures/core__heading__h2.parsed.json
index a6d515e0ac0f1..ac1a8481600c8 100644
--- a/blocks/test/fixtures/core__heading__h2.parsed.json
+++ b/blocks/test/fixtures/core__heading__h2.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/heading",
         "attrs": null,
-        "rawContent": "\n<h2>A picture is worth a thousand words, or so the saying goes</h2>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<h2>A picture is worth a thousand words, or so the saying goes</h2>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__html.parsed.json b/blocks/test/fixtures/core__html.parsed.json
index ae94db5e9027e..db9e8557401f2 100644
--- a/blocks/test/fixtures/core__html.parsed.json
+++ b/blocks/test/fixtures/core__html.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/html",
         "attrs": null,
-        "rawContent": "\n<h1>Some HTML code</h1>\n<marquee>This text will scroll from right to left</marquee>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<h1>Some HTML code</h1>\n<marquee>This text will scroll from right to left</marquee>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__image.parsed.json b/blocks/test/fixtures/core__image.parsed.json
index e948d85add5d5..598a6bb4564fb 100644
--- a/blocks/test/fixtures/core__image.parsed.json
+++ b/blocks/test/fixtures/core__image.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/image",
         "attrs": null,
-        "rawContent": "\n<figure class=\"wp-block-image\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" /></figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-image\"><img src=\"https://cldup.com/uuUqE_dXzy.jpg\" /></figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__image__center-caption.parsed.json b/blocks/test/fixtures/core__image__center-caption.parsed.json
index dbc7b92dd3866..0ed23ba9eb7dc 100644
--- a/blocks/test/fixtures/core__image__center-caption.parsed.json
+++ b/blocks/test/fixtures/core__image__center-caption.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "align": "center"
         },
-        "rawContent": "\n<figure class=\"wp-block-image\"><img src=\"https://cldup.com/YLYhpou2oq.jpg\" class=\"aligncenter\"/><figcaption>Give it a try. Press the &quot;really wide&quot; button on the image toolbar.</figcaption></figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-image\"><img src=\"https://cldup.com/YLYhpou2oq.jpg\" class=\"aligncenter\"/><figcaption>Give it a try. Press the &quot;really wide&quot; button on the image toolbar.</figcaption></figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__latest-posts.parsed.json b/blocks/test/fixtures/core__latest-posts.parsed.json
index ac3a8dba1cc67..fcd90ca27a2fa 100644
--- a/blocks/test/fixtures/core__latest-posts.parsed.json
+++ b/blocks/test/fixtures/core__latest-posts.parsed.json
@@ -5,10 +5,11 @@
             "postsToShow": 5,
             "displayPostDate": false
         },
-        "rawContent": ""
+        "innerBlocks": [],
+        "innerHtml": ""
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__latest-posts__displayPostDate.parsed.json b/blocks/test/fixtures/core__latest-posts__displayPostDate.parsed.json
index c0b53e30ca56b..8e53ba17500d0 100644
--- a/blocks/test/fixtures/core__latest-posts__displayPostDate.parsed.json
+++ b/blocks/test/fixtures/core__latest-posts__displayPostDate.parsed.json
@@ -5,10 +5,11 @@
             "postsToShow": 5,
             "displayPostDate": true
         },
-        "rawContent": ""
+        "innerBlocks": [],
+        "innerHtml": ""
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__list__ul.parsed.json b/blocks/test/fixtures/core__list__ul.parsed.json
index c29157168e32c..cc014bccbed07 100644
--- a/blocks/test/fixtures/core__list__ul.parsed.json
+++ b/blocks/test/fixtures/core__list__ul.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/list",
         "attrs": null,
-        "rawContent": "\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<ul><li>Text & Headings</li><li>Images & Videos</li><li>Galleries</li><li>Embeds, like YouTube, Tweets, or other WordPress posts.</li><li>Layout blocks, like Buttons, Hero Images, Separators, etc.</li><li>And <em>Lists</em> like this one of course :)</li></ul>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__more.parsed.json b/blocks/test/fixtures/core__more.parsed.json
index 6f7ceb8d3fa93..ef2e666255317 100644
--- a/blocks/test/fixtures/core__more.parsed.json
+++ b/blocks/test/fixtures/core__more.parsed.json
@@ -4,10 +4,10 @@
         "attrs": {
             "noTeaser": false
         },
-        "rawContent": ""
+        "innerHtml": ""
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__more__custom-text-teaser.parsed.json b/blocks/test/fixtures/core__more__custom-text-teaser.parsed.json
index 934867ec1146b..6eaf7fd5ba23c 100644
--- a/blocks/test/fixtures/core__more__custom-text-teaser.parsed.json
+++ b/blocks/test/fixtures/core__more__custom-text-teaser.parsed.json
@@ -5,10 +5,10 @@
             "customText": "Continue Reading",
             "noTeaser": true
         },
-        "rawContent": ""
+        "innerHtml": ""
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__paragraph__align-right.parsed.json b/blocks/test/fixtures/core__paragraph__align-right.parsed.json
index 85679884e3baa..e2d444ad44b52 100644
--- a/blocks/test/fixtures/core__paragraph__align-right.parsed.json
+++ b/blocks/test/fixtures/core__paragraph__align-right.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "align": "right"
         },
-        "rawContent": "\n<p style=\"text-align:right;\">... like this one, which is separate from the above and right aligned.</p>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<p style=\"text-align:right;\">... like this one, which is separate from the above and right aligned.</p>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__preformatted.parsed.json b/blocks/test/fixtures/core__preformatted.parsed.json
index b0854646ed594..b5a3db6e5b3f8 100644
--- a/blocks/test/fixtures/core__preformatted.parsed.json
+++ b/blocks/test/fixtures/core__preformatted.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/preformatted",
         "attrs": null,
-        "rawContent": "\n<pre class=\"wp-block-preformatted\">Some <em>preformatted</em> text...<br>And more!</pre>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<pre class=\"wp-block-preformatted\">Some <em>preformatted</em> text...<br>And more!</pre>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__pullquote.parsed.json b/blocks/test/fixtures/core__pullquote.parsed.json
index 92a37a6ba57a7..4e41e126cc0fb 100644
--- a/blocks/test/fixtures/core__pullquote.parsed.json
+++ b/blocks/test/fixtures/core__pullquote.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/pullquote",
         "attrs": null,
-        "rawContent": "\n<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p><footer>...with a caption</footer>\n</blockquote>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p><footer>...with a caption</footer>\n</blockquote>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__pullquote__multi-paragraph.parsed.json b/blocks/test/fixtures/core__pullquote__multi-paragraph.parsed.json
index 06efdaa59953a..339905d8dfe06 100644
--- a/blocks/test/fixtures/core__pullquote__multi-paragraph.parsed.json
+++ b/blocks/test/fixtures/core__pullquote__multi-paragraph.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/pullquote",
         "attrs": null,
-        "rawContent": "\n<blockquote class=\"wp-block-pullquote alignnone\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <footer>by whomever</footer>\n</blockquote>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<blockquote class=\"wp-block-pullquote alignnone\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <footer>by whomever</footer>\n</blockquote>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__quote__style-1.parsed.json b/blocks/test/fixtures/core__quote__style-1.parsed.json
index 879a3d51b2c41..2bf73c02b81a8 100644
--- a/blocks/test/fixtures/core__quote__style-1.parsed.json
+++ b/blocks/test/fixtures/core__quote__style-1.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "style": "1"
         },
-        "rawContent": "\n<blockquote class=\"wp-block-quote blocks-quote-style-1\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer>Matt Mullenweg, 2017</footer></blockquote>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<blockquote class=\"wp-block-quote blocks-quote-style-1\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer>Matt Mullenweg, 2017</footer></blockquote>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__quote__style-2.parsed.json b/blocks/test/fixtures/core__quote__style-2.parsed.json
index 063284c0fd75b..763d4196275a4 100644
--- a/blocks/test/fixtures/core__quote__style-2.parsed.json
+++ b/blocks/test/fixtures/core__quote__style-2.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "style": "2"
         },
-        "rawContent": "\n<blockquote class=\"wp-block-quote blocks-quote-style-2\"><p>There is no greater agony than bearing an untold story inside you.</p><footer>Maya Angelou</footer></blockquote>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<blockquote class=\"wp-block-quote blocks-quote-style-2\"><p>There is no greater agony than bearing an untold story inside you.</p><footer>Maya Angelou</footer></blockquote>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__separator.parsed.json b/blocks/test/fixtures/core__separator.parsed.json
index 9dbc62b9dbd84..1329526ea4f03 100644
--- a/blocks/test/fixtures/core__separator.parsed.json
+++ b/blocks/test/fixtures/core__separator.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/separator",
         "attrs": null,
-        "rawContent": "\n<hr class=\"wp-block-separator\" />\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<hr class=\"wp-block-separator\" />\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__shortcode.parsed.json b/blocks/test/fixtures/core__shortcode.parsed.json
index 1d2c79754d4c6..4fa40c33155bf 100644
--- a/blocks/test/fixtures/core__shortcode.parsed.json
+++ b/blocks/test/fixtures/core__shortcode.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/shortcode",
         "attrs": null,
-        "rawContent": "\n[gallery ids=\"238,338\"]\n"
+        "innerBlocks": [],
+        "innerHtml": "\n[gallery ids=\"238,338\"]\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__table.parsed.json b/blocks/test/fixtures/core__table.parsed.json
index 50bf531dbf042..6a751b3aeb60a 100644
--- a/blocks/test/fixtures/core__table.parsed.json
+++ b/blocks/test/fixtures/core__table.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/table",
         "attrs": null,
-        "rawContent": "\n<table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<table><thead><tr><th>Version</th><th>Musician</th><th>Date</th></tr></thead><tbody><tr><td><a href=\"https://wordpress.org/news/2003/05/wordpress-now-available/\">.70</a></td><td>No musician chosen.</td><td>May 27, 2003</td></tr><tr><td><a href=\"https://wordpress.org/news/2004/01/wordpress-10/\">1.0</a></td><td>Miles Davis</td><td>January 3, 2004</td></tr><tr><td>Lots of versions skipped, see <a href=\"https://codex.wordpress.org/WordPress_Versions\">the full list</a></td><td>&hellip;</td><td>&hellip;</td></tr><tr><td><a href=\"https://wordpress.org/news/2015/12/clifford/\">4.4</a></td><td>Clifford Brown</td><td>December 8, 2015</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/04/coleman/\">4.5</a></td><td>Coleman Hawkins</td><td>April 12, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/08/pepper/\">4.6</a></td><td>Pepper Adams</td><td>August 16, 2016</td></tr><tr><td><a href=\"https://wordpress.org/news/2016/12/vaughan/\">4.7</a></td><td>Sarah Vaughan</td><td>December 6, 2016</td></tr></tbody></table>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__text-columns.parsed.json b/blocks/test/fixtures/core__text-columns.parsed.json
index 7da76afc58177..0fd88b4446471 100644
--- a/blocks/test/fixtures/core__text-columns.parsed.json
+++ b/blocks/test/fixtures/core__text-columns.parsed.json
@@ -4,10 +4,11 @@
         "attrs": {
             "width": "center"
         },
-        "rawContent": "\n<section class=\"wp-block-text-columns aligncenter columns-2\">\n    <div class=\"wp-block-column\">\n        <p>One</p>\n    </div>\n    <div class=\"wp-block-column\">\n        <p>Two</p>\n    </div>\n</section>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<section class=\"wp-block-text-columns aligncenter columns-2\">\n    <div class=\"wp-block-column\">\n        <p>One</p>\n    </div>\n    <div class=\"wp-block-column\">\n        <p>Two</p>\n    </div>\n</section>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__text__converts-to-paragraph.parsed.json b/blocks/test/fixtures/core__text__converts-to-paragraph.parsed.json
index dd84d957d4663..4fe50f7572745 100644
--- a/blocks/test/fixtures/core__text__converts-to-paragraph.parsed.json
+++ b/blocks/test/fixtures/core__text__converts-to-paragraph.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/text",
         "attrs": null,
-        "rawContent": "\n<p>This is an old-style text block.  Changed to <code>core/paragraph</code> in #2135.</p>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<p>This is an old-style text block.  Changed to <code>core/paragraph</code> in #2135.</p>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__verse.parsed.json b/blocks/test/fixtures/core__verse.parsed.json
index 03d2775e3d6af..4d1fed342e9fe 100644
--- a/blocks/test/fixtures/core__verse.parsed.json
+++ b/blocks/test/fixtures/core__verse.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/verse",
         "attrs": null,
-        "rawContent": "\n<pre class=\"wp-block-verse\">A <em>verse</em>…<br>And more!</pre>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<pre class=\"wp-block-verse\">A <em>verse</em>…<br>And more!</pre>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]
diff --git a/blocks/test/fixtures/core__video.parsed.json b/blocks/test/fixtures/core__video.parsed.json
index 11263bad0a5ee..dbbfeb55d15c3 100644
--- a/blocks/test/fixtures/core__video.parsed.json
+++ b/blocks/test/fixtures/core__video.parsed.json
@@ -2,10 +2,11 @@
     {
         "blockName": "core/video",
         "attrs": null,
-        "rawContent": "\n<figure class=\"wp-block-video\"><video src=\"https://awesome-fake.video/file.mp4\" controls=\"\"></video></figure>\n"
+        "innerBlocks": [],
+        "innerHtml": "\n<figure class=\"wp-block-video\"><video src=\"https://awesome-fake.video/file.mp4\" controls=\"\"></video></figure>\n"
     },
     {
-        "attrs": {},
-        "rawContent": "\n"
+        "blockName": "core/freeform",
+        "innerHtml": "\n"
     }
 ]