diff --git a/themeunittestdata.wordpress.xml b/themeunittestdata.wordpress.xml
index d9e22dc..44449d8 100644
--- a/themeunittestdata.wordpress.xml
+++ b/themeunittestdata.wordpress.xml
@@ -808,11 +808,6 @@
   <wp:tag_slug>post</wp:tag_slug>
   <wp:tag_name><![CDATA[post]]></wp:tag_name>
 </wp:tag>
-<wp:tag>
-  <wp:term_id>44090582</wp:term_id>
-  <wp:tag_slug>post-formats</wp:tag_slug>
-  <wp:tag_name><![CDATA[Post Formats]]></wp:tag_name>
-</wp:tag>
 <wp:tag>
   <wp:term_id>2834922</wp:term_id>
   <wp:tag_slug>precipitancy</wp:tag_slug>
@@ -2440,7 +2435,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
 </item>
 <item>
-  <title>Pages</title>
+  <title><![CDATA[Some <br>Pages]]></title>
   <link>https://wpthemetestdata.wordpress.com/2013/04/09/pages/</link>
   <pubDate>Tue, 09 Apr 2013 13:37:45 +0000</pubDate>
   <dc:creator>themedemos</dc:creator>
@@ -2463,7 +2458,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   <category domain="nav_menu" nicename="testing-menu"><![CDATA[Testing Menu]]></category>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[post_type]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -2471,11 +2466,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[1100]]></wp:meta_value>
+    <wp:meta_value><![CDATA[733]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[page]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_target</wp:meta_key>
@@ -2491,7 +2486,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_url</wp:meta_key>
-    <wp:meta_value><![CDATA[#]]></wp:meta_value>
+    <wp:meta_value><![CDATA[]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -2518,7 +2513,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   <category domain="nav_menu" nicename="testing-menu"><![CDATA[Testing Menu]]></category>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[taxonomy]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -2526,11 +2521,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[1101]]></wp:meta_value>
+    <wp:meta_value><![CDATA[1656]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[post_tag]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_target</wp:meta_key>
@@ -2546,7 +2541,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_url</wp:meta_key>
-    <wp:meta_value><![CDATA[#]]></wp:meta_value>
+    <wp:meta_value><![CDATA[]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -2666,7 +2661,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   <dc:creator>themedemos</dc:creator>
   <guid isPermaLink="false">https://wpthemetestdata.wordpress.com/2013/04/09/1118</guid>
   <description/>
-  <content:encoded><![CDATA[Posts in this category test unpublished posts.]]></content:encoded>
+  <content:encoded><![CDATA[Posts that have edge-case related tests]]></content:encoded>
   <excerpt:encoded><![CDATA[]]></excerpt:encoded>
   <wp:post_id>1118</wp:post_id>
   <wp:post_date>2013-04-09 06:37:46</wp:post_date>
@@ -2691,7 +2686,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[54090]]></wp:meta_value>
+    <wp:meta_value><![CDATA[161095136]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
@@ -2801,7 +2796,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[post_type]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -2809,11 +2804,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[1120]]></wp:meta_value>
+    <wp:meta_value><![CDATA[174]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[page]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_target</wp:meta_key>
@@ -2829,7 +2824,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_url</wp:meta_key>
-    <wp:meta_value><![CDATA[#]]></wp:meta_value>
+    <wp:meta_value><![CDATA[]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -2860,7 +2855,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[post_type]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -2868,11 +2863,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[1121]]></wp:meta_value>
+    <wp:meta_value><![CDATA[173]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[custom]]></wp:meta_value>
+    <wp:meta_value><![CDATA[page]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_target</wp:meta_key>
@@ -2888,7 +2883,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_url</wp:meta_key>
-    <wp:meta_value><![CDATA[#]]></wp:meta_value>
+    <wp:meta_value><![CDATA[]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -3364,7 +3359,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
 </item>
 <item>
-  <title>Advanced</title>
+  <title><![CDATA[Advanced &frac12;]]></title>
   <link>https://wpthemetestdata.wordpress.com/2013/04/09/advanced/</link>
   <pubDate>Tue, 09 Apr 2013 13:37:49 +0000</pubDate>
   <dc:creator>themedemos</dc:creator>
@@ -3848,7 +3843,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
 		<wp:post_name><![CDATA[facebook-com]]></wp:post_name>
 		<wp:status><![CDATA[publish]]></wp:status>
 		<wp:post_parent>0</wp:post_parent>
-		<wp:menu_order>2</wp:menu_order>
+		<wp:menu_order>3</wp:menu_order>
 		<wp:post_type><![CDATA[nav_menu_item]]></wp:post_type>
 		<wp:post_password><![CDATA[]]></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
@@ -3903,7 +3898,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
 		<wp:post_name><![CDATA[github-com]]></wp:post_name>
 		<wp:status><![CDATA[publish]]></wp:status>
 		<wp:post_parent>0</wp:post_parent>
-		<wp:menu_order>3</wp:menu_order>
+		<wp:menu_order>2</wp:menu_order>
 		<wp:post_type><![CDATA[nav_menu_item]]></wp:post_type>
 		<wp:post_password><![CDATA[]]></wp:post_password>
 		<wp:is_sticky>0</wp:is_sticky>
@@ -4177,11 +4172,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[page]]></wp:meta_value>
+    <wp:meta_value><![CDATA[category]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[2]]></wp:meta_value>
+    <wp:meta_value><![CDATA[33328006]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -4189,7 +4184,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[post_type]]></wp:meta_value>
+    <wp:meta_value><![CDATA[taxonomy]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -4236,11 +4231,11 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object</wp:meta_key>
-    <wp:meta_value><![CDATA[page]]></wp:meta_value>
+    <wp:meta_value><![CDATA[category]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[501]]></wp:meta_value>
+    <wp:meta_value><![CDATA[193]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -4248,7 +4243,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_type</wp:meta_key>
-    <wp:meta_value><![CDATA[post_type]]></wp:meta_value>
+    <wp:meta_value><![CDATA[taxonomy]]></wp:meta_value>
   </wp:postmeta>
 </item>
 <item>
@@ -4299,7 +4294,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[155]]></wp:meta_value>
+    <wp:meta_value><![CDATA[501]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -4358,7 +4353,7 @@ If the site is set to display the Blog Posts Index as the Front Page, then this
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_object_id</wp:meta_key>
-    <wp:meta_value><![CDATA[156]]></wp:meta_value>
+    <wp:meta_value><![CDATA[155]]></wp:meta_value>
   </wp:postmeta>
   <wp:postmeta>
     <wp:meta_key>_menu_item_menu_item_parent</wp:meta_key>
@@ -6706,7 +6701,6 @@ Occasionally in her travels through her children's minds Mrs. Darling found thin
   <wp:post_password/>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_tag" nicename="readability"><![CDATA[readability]]></category>
   <category domain="post_tag" nicename="standard-2"><![CDATA[standard]]></category>
@@ -6756,7 +6750,6 @@ You can use this page to test the Theme's handling of the gallery shortcode, inc
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="gallery"><![CDATA[gallery]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-gallery"><![CDATA[Gallery]]></category>
   <category domain="post_tag" nicename="shortcode"><![CDATA[shortcode]]></category>
@@ -6784,7 +6777,6 @@ You can use this page to test the Theme's handling of the gallery shortcode, inc
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="aside"><![CDATA[aside]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-aside"><![CDATA[Aside]]></category>
 </item>
@@ -6934,7 +6926,6 @@ Abbott: Oh, that's our shortstop!]]></content:encoded>
   <wp:post_password/>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="post_tag" nicename="chat"><![CDATA[chat]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-chat"><![CDATA[Chat]]></category>
@@ -6962,7 +6953,6 @@ Abbott: Oh, that's our shortstop!]]></content:encoded>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="link"><![CDATA[link]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-link"><![CDATA[Link]]></category>
 </item>
@@ -6990,7 +6980,6 @@ Abbott: Oh, that's our shortstop!]]></content:encoded>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="image"><![CDATA[image]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-image"><![CDATA[Image]]></category>
 </item>
@@ -7017,7 +7006,6 @@ Abbott: Oh, that's our shortstop!]]></content:encoded>
   <wp:post_password/>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-quote"><![CDATA[Quote]]></category>
   <category domain="post_tag" nicename="quote"><![CDATA[quote]]></category>
@@ -7044,7 +7032,6 @@ Abbott: Oh, that's our shortstop!]]></content:encoded>
   <wp:post_password/>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-status"><![CDATA[Status]]></category>
   <category domain="post_tag" nicename="status"><![CDATA[status]]></category>
@@ -7074,7 +7061,6 @@ Posted as per the <a href="https://codex.wordpress.org/Embeds" target="_blank">i
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="embeds-2"><![CDATA[embeds]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-video"><![CDATA[Video]]></category>
   <category domain="post_tag" nicename="video"><![CDATA[video]]></category>
@@ -7129,7 +7115,6 @@ Audio shortcode:
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="audio"><![CDATA[audio]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-audio"><![CDATA[Audio]]></category>
   <category domain="post_tag" nicename="shortcode"><![CDATA[shortcode]]></category>
@@ -7542,7 +7527,6 @@ This is some text after the Tiled Gallery just to make sure that everything spac
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="gallery"><![CDATA[gallery]]></category>
   <category domain="post_tag" nicename="jetpack-2"><![CDATA[jetpack]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-gallery"><![CDATA[Gallery]]></category>
   <category domain="post_tag" nicename="shortcode"><![CDATA[shortcode]]></category>
@@ -8574,7 +8558,6 @@ There should be no comment reply form, but <em>should</em> display pingbacks and
   <category domain="post_tag" nicename="mustread"><![CDATA[Must Read]]></category>
   <category domain="post_tag" nicename="nailedit"><![CDATA[Nailed It]]></category>
   <category domain="post_tag" nicename="pictures"><![CDATA[Pictures]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_tag" nicename="quote"><![CDATA[quote]]></category>
   <category domain="post_tag" nicename="shortcode"><![CDATA[shortcode]]></category>
   <category domain="post_tag" nicename="standard-2"><![CDATA[standard]]></category>
@@ -8729,7 +8712,6 @@ It should not be displayed by the theme.]]></content:encoded>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="image"><![CDATA[image]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-image"><![CDATA[Image]]></category>
 </item>
@@ -8757,7 +8739,6 @@ Learn more about <a title="WordPress Embeds" href="https://codex.wordpress.org/E
   <wp:post_password/>
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-video"><![CDATA[Video]]></category>
 </item>
@@ -8784,7 +8765,6 @@ Learn more about <a title="WordPress Embeds" href="https://codex.wordpress.org/E
   <wp:is_sticky>0</wp:is_sticky>
   <category domain="category" nicename="classic"><![CDATA[Classic]]></category>
   <category domain="post_tag" nicename="image"><![CDATA[image]]></category>
-  <category domain="post_tag" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="category" nicename="post-formats"><![CDATA[Post Formats]]></category>
   <category domain="post_format" nicename="post-format-image"><![CDATA[Image]]></category>
   <category domain="post_tag" nicename="shortcode"><![CDATA[shortcode]]></category>