diff --git a/tests/abstract001.html b/tests/abstract001.html
index 09d3adfe2c..9403875d6b 100644
--- a/tests/abstract001.html
+++ b/tests/abstract001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/adjacent-boilerplate/adjacent-boilerplate.html b/tests/adjacent-boilerplate/adjacent-boilerplate.html
index afbded52f7..e740800d4b 100644
--- a/tests/adjacent-boilerplate/adjacent-boilerplate.html
+++ b/tests/adjacent-boilerplate/adjacent-boilerplate.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/advisement001.html b/tests/advisement001.html
index 3af128ce75..2caa863933 100644
--- a/tests/advisement001.html
+++ b/tests/advisement001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Advisements</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/algorithm001.html b/tests/algorithm001.html
index 937d84fbc4..6021655a3c 100644
--- a/tests/algorithm001.html
+++ b/tests/algorithm001.html
@@ -574,7 +574,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/basic001.html b/tests/basic001.html
index 0fffb263f9..7e38479ba8 100644
--- a/tests/basic001.html
+++ b/tests/basic001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio001.html b/tests/biblio001.html
index 1a27f33c2c..fc3a7def37 100644
--- a/tests/biblio001.html
+++ b/tests/biblio001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio002.html b/tests/biblio002.html
index fa56d3872b..94b2d65706 100644
--- a/tests/biblio002.html
+++ b/tests/biblio002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio003.html b/tests/biblio003.html
index b7d5936a49..564a85db68 100644
--- a/tests/biblio003.html
+++ b/tests/biblio003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio004.html b/tests/biblio004.html
index ea0aa9e99a..2cd74155e8 100644
--- a/tests/biblio004.html
+++ b/tests/biblio004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio005.html b/tests/biblio005.html
index 6c686b5fcf..37a440239a 100644
--- a/tests/biblio005.html
+++ b/tests/biblio005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio006.html b/tests/biblio006.html
index ddb93c8bda..1a67f429af 100644
--- a/tests/biblio006.html
+++ b/tests/biblio006.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/biblio007.html b/tests/biblio007.html
index 7e58386016..46dcf65b7f 100644
--- a/tests/biblio007.html
+++ b/tests/biblio007.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/boilerplate-substitution001.html b/tests/boilerplate-substitution001.html
index a7f11ed0f3..a54f4272e7 100644
--- a/tests/boilerplate-substitution001.html
+++ b/tests/boilerplate-substitution001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/caniuse001.html b/tests/caniuse001.html
index 94bc6c0532..08f1a56599 100644
--- a/tests/caniuse001.html
+++ b/tests/caniuse001.html
@@ -717,7 +717,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/comments001.html b/tests/comments001.html
index 5e7369790b..3a7bdeae6a 100644
--- a/tests/comments001.html
+++ b/tests/comments001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/conditional001.bs b/tests/conditional001.bs
index 5d78c5dbd6..ab2d7caec8 100644
--- a/tests/conditional001.bs
+++ b/tests/conditional001.bs
@@ -1,64 +1,65 @@
 <pre class=metadata>
 Title: Foo
-Group: test
 Shortname: foo
 Level: 1
-Status: w3c/ED
+Org: bikeshed
+Group: test
+Status: TEST
 ED: http://example.com/foo
 Abstract: Testing basic support for conditionals.
 Editor: Example Editor
 Date: 1970-01-01
 </pre>
 
-<div include-if="ED">
-    1. Included, since status is ED
+<div include-if="TEST">
+    1. Included, since status is TEST
 </div>
 
-<p include-if="w3c/ED">
-    2. Included, since status canonicalizes to w3c/ED.
+<p include-if="bikeshed/TEST">
+    2. Included, since status canonicalizes to bikeshed/TEST.
 </p>
 
-<div include-if="ietf/ED">
-    Excluded, since megagroup is wrong.
+<div include-if="bikeshed-2/TEST">
+    Excluded, since org is wrong.
 </div>
 
-<div include-if="CR">
-    Excluded, since status is not CR.
+<div include-if="TEST-2">
+    Excluded, since status is not TEST-2.
 </div>
 
 <hr>
 
-<div exclude-if="ED">
-    Excluded, since status is ED
+<div exclude-if="TEST">
+    Excluded, since status is TEST
 </div>
 
-<p exclude-if="w3c/ED">
-    Excluded, since status canonicalizes to w3c/ED.
+<p exclude-if="bikeshed/TEST">
+    Excluded, since status canonicalizes to bikeshed/TEST.
 </p>
 
-<div exclude-if="ietf/ED">
-    3. Included, since megagroup is wrong.
+<div exclude-if="bikeshed-2/TEST">
+    3. Included, since org is wrong.
 </div>
 
-<div exclude-if="CR">
-    4. Included, since status is not CR.
+<div exclude-if="TEST-2">
+    4. Included, since status is not TEST-2.
 </div>
 
-<p>The attributes <span include-if=ED>5. can</span><span exclude-if=ED>can't</span> be used on inlines as well.</p>
+<p>The attributes <span include-if=TEST>5. can</span><span exclude-if=TEST>can't</span> be used on inlines as well.</p>
 
-<div include-if="CR, ED">
+<div include-if="CR, TEST">
     6. Included, because at least one condition matched.
 </div>
 
-<div include-if="CR, REC">
+<div include-if="CR, TEST-2">
     Excluded, because none of the conditions matched.
 </div>
 
-<div exclude-if="CR, REC">
+<div exclude-if="CR, TEST-2">
     7. Included, because none of the exclude conditions matched.
 </div>
 
-<div exclude-if="CR, ED">
+<div exclude-if="CR, TEST">
     Excluded because at least one condition matched.
 </div>
 
diff --git a/tests/conditional001.html b/tests/conditional001.html
index a683d9bc02..0d69e3ac53 100644
--- a/tests/conditional001.html
+++ b/tests/conditional001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#ED">Editor’s Draft</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Bikeshed Test File, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
@@ -432,26 +432,26 @@ <h2 class="no-num no-toc no-ref" id="contents">Table of Contents</h2>
    <div>
     <ol>
      <li data-md>
-      <p>Included, since status is ED</p>
+      <p>Included, since status is TEST</p>
     </ol>
    </div>
    <p></p>
    <ol start="2">
     <li data-md>
-     <p>Included, since status canonicalizes to w3c/ED.</p>
+     <p>Included, since status canonicalizes to bikeshed/TEST.</p>
    </ol>
    <p></p>
    <hr>
    <div>
     <ol start="3">
      <li data-md>
-      <p>Included, since megagroup is wrong.</p>
+      <p>Included, since org is wrong.</p>
     </ol>
    </div>
    <div>
     <ol start="4">
      <li data-md>
-      <p>Included, since status is not CR.</p>
+      <p>Included, since status is not TEST-2.</p>
     </ol>
    </div>
    <p>The attributes <span>5. can</span> be used on inlines as well.</p>
diff --git a/tests/conditional002.bs b/tests/conditional002.bs
index 6a5097fa7c..66928bb483 100644
--- a/tests/conditional002.bs
+++ b/tests/conditional002.bs
@@ -1,9 +1,10 @@
 <pre class=metadata>
 Title: Foo
+Org: bikeshed
 Group: test
+Status: test
 Shortname: foo
 Level: 1
-Status: w3c/ED
 ED: http://example.com/foo
 Abstract: Testing support for &lt;if-wrapper>.
 Editor: Example Editor
@@ -12,29 +13,29 @@ Date: 1970-01-01
 
 <if-wrapper>Excluded and an error, since no conditions.</if-wrapper>
 
-<if-wrapper include-if=ED>
+<if-wrapper include-if=TEST>
     <div>1. Included, since the wrapper passes.</div>
 </if-wrapper>
 
 <div>
-    <if-wrapper include-if=ED>2. Included, since the wrapper passes.</if-wrapper>
+    <if-wrapper include-if=TEST>2. Included, since the wrapper passes.</if-wrapper>
 </div>
 
-<if-wrapper include-if=ED>
-    <if-wrapper include-if=ED>
+<if-wrapper include-if=TEST>
+    <if-wrapper include-if=TEST>
         <div>3. Stacked wrapper is ok.</div>
     </if-wrapper>
 </if-wrapper>
 
-<if-wrapper include-if=ED>
+<if-wrapper include-if=TEST>
     <div>4. Stuff between the wrappers
-        <if-wrapper include-if=ED>
+        <if-wrapper include-if=TEST>
             5. also shows up fine.
         </if-wrapper>
     </div>
 </if-wrapper>
 
-<if-wrapper exclude-if=ED>
+<if-wrapper exclude-if=TEST>
     Removed, since the wrapper fails.
 </if-wrapper>
 
diff --git a/tests/conditional002.console.txt b/tests/conditional002.console.txt
index 7bd108a7c7..a2c16e4ca9 100644
--- a/tests/conditional002.console.txt
+++ b/tests/conditional002.console.txt
@@ -1 +1 @@
-LINE 13: <if-wrapper> elements must have an include-if and/or exclude-if attribute.
+LINE 14: <if-wrapper> elements must have an include-if and/or exclude-if attribute.
diff --git a/tests/conditional002.html b/tests/conditional002.html
index 7035a8bca3..c6f7fd877d 100644
--- a/tests/conditional002.html
+++ b/tests/conditional002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#ED">Editor’s Draft</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Bikeshed Test File, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/conditional003.bs b/tests/conditional003.bs
index 3c18cbfbf5..9584cf12a6 100644
--- a/tests/conditional003.bs
+++ b/tests/conditional003.bs
@@ -1,9 +1,9 @@
 <pre class=metadata>
 Title: Foo
 Group: test
+Status: TEST
 Shortname: foo
 Level: 1
-Status: w3c/ED
 ED: http://example.com/foo
 Abstract: Testing conditionals over boilerplate and text macros.
 Editor: Example Editor
diff --git a/tests/conditional003.html b/tests/conditional003.html
index d53b25b732..1d4e07311d 100644
--- a/tests/conditional003.html
+++ b/tests/conditional003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#ED">Editor’s Draft</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Bikeshed Test File, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/css-production-range001.html b/tests/css-production-range001.html
index fc2c53b340..fe807feb08 100644
--- a/tests/css-production-range001.html
+++ b/tests/css-production-range001.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/dict-type.html b/tests/dict-type.html
index 2d54be26a8..14382aef65 100644
--- a/tests/dict-type.html
+++ b/tests/dict-type.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/elementdef001.html b/tests/elementdef001.html
index 5fe0b31069..93d9744c43 100644
--- a/tests/elementdef001.html
+++ b/tests/elementdef001.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint001.html b/tests/fingerprint001.html
index c524a288c9..b97f43fc77 100644
--- a/tests/fingerprint001.html
+++ b/tests/fingerprint001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint002.html b/tests/fingerprint002.html
index f546b73507..0f32449e42 100644
--- a/tests/fingerprint002.html
+++ b/tests/fingerprint002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint003.html b/tests/fingerprint003.html
index 79b78427ee..228a91b1ee 100644
--- a/tests/fingerprint003.html
+++ b/tests/fingerprint003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint004.html b/tests/fingerprint004.html
index be99e30df8..54e7b051ff 100644
--- a/tests/fingerprint004.html
+++ b/tests/fingerprint004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint005.html b/tests/fingerprint005.html
index f101295444..e8729eeceb 100644
--- a/tests/fingerprint005.html
+++ b/tests/fingerprint005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/fingerprint006.html b/tests/fingerprint006.html
index 6664ca92ff..ee3dc5882c 100644
--- a/tests/fingerprint006.html
+++ b/tests/fingerprint006.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/force-crossorigin001.html b/tests/force-crossorigin001.html
index 42da625fb9..ac20678deb 100644
--- a/tests/force-crossorigin001.html
+++ b/tests/force-crossorigin001.html
@@ -408,7 +408,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl001.html b/tests/idl001.html
index 9ce5b42f1b..9852489435 100644
--- a/tests/idl001.html
+++ b/tests/idl001.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl002.html b/tests/idl002.html
index c8e3e7b1c1..eb82dcf909 100644
--- a/tests/idl002.html
+++ b/tests/idl002.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl003.html b/tests/idl003.html
index 634d2b5f28..28be690722 100644
--- a/tests/idl003.html
+++ b/tests/idl003.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl004.html b/tests/idl004.html
index 763877e46b..4d61d297c9 100644
--- a/tests/idl004.html
+++ b/tests/idl004.html
@@ -531,7 +531,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl005.html b/tests/idl005.html
index e36e36b520..9218cdd75f 100644
--- a/tests/idl005.html
+++ b/tests/idl005.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl006.html b/tests/idl006.html
index c18fb23fc5..c9962852e1 100644
--- a/tests/idl006.html
+++ b/tests/idl006.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl007.html b/tests/idl007.html
index a182545bb2..25522880e3 100644
--- a/tests/idl007.html
+++ b/tests/idl007.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/idl008.html b/tests/idl008.html
index 8e481540fd..1009faa17b 100644
--- a/tests/idl008.html
+++ b/tests/idl008.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/img-sizing/image-size001.html b/tests/img-sizing/image-size001.html
index 9d1938d667..2e43dd0a87 100644
--- a/tests/img-sizing/image-size001.html
+++ b/tests/img-sizing/image-size001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include001.html b/tests/include001.html
index cbee5c7ee8..67d2e55524 100644
--- a/tests/include001.html
+++ b/tests/include001.html
@@ -446,7 +446,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include002.html b/tests/include002.html
index cb49253a11..5e038dfe66 100644
--- a/tests/include002.html
+++ b/tests/include002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include003.html b/tests/include003.html
index d1fd0f8018..1221cd7c08 100644
--- a/tests/include003.html
+++ b/tests/include003.html
@@ -572,7 +572,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include004.html b/tests/include004.html
index 21f9d56bd1..60b457575e 100644
--- a/tests/include004.html
+++ b/tests/include004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include005.html b/tests/include005.html
index 42f9de8815..3bf70da4da 100644
--- a/tests/include005.html
+++ b/tests/include005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/include006.html b/tests/include006.html
index a73554f407..22d1792e4d 100644
--- a/tests/include006.html
+++ b/tests/include006.html
@@ -446,7 +446,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/index001.html b/tests/index001.html
index 8681592dd7..3d838e2a89 100644
--- a/tests/index001.html
+++ b/tests/index001.html
@@ -531,7 +531,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/index002.html b/tests/index002.html
index aa1ec75e4c..45101e9cc1 100644
--- a/tests/index002.html
+++ b/tests/index002.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/index003.html b/tests/index003.html
index a2c469813b..7181990c32 100644
--- a/tests/index003.html
+++ b/tests/index003.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/lexer001.html b/tests/lexer001.html
index e6438487c7..b317a006b4 100644
--- a/tests/lexer001.html
+++ b/tests/lexer001.html
@@ -528,7 +528,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/line-count-001.html b/tests/line-count-001.html
index 33ba19599d..3ece8a01b3 100644
--- a/tests/line-count-001.html
+++ b/tests/line-count-001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/link-shorthands001.html b/tests/link-shorthands001.html
index ef89eae03e..62c1731704 100644
--- a/tests/link-shorthands001.html
+++ b/tests/link-shorthands001.html
@@ -569,7 +569,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links001.html b/tests/links001.html
index db9e01126b..1018daa420 100644
--- a/tests/links001.html
+++ b/tests/links001.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links002.html b/tests/links002.html
index 293a320636..405e7eed29 100644
--- a/tests/links002.html
+++ b/tests/links002.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links003.html b/tests/links003.html
index f6f6f337ba..d79ec81cd4 100644
--- a/tests/links003.html
+++ b/tests/links003.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links004.html b/tests/links004.html
index 7c899e4456..f79c9a928f 100644
--- a/tests/links004.html
+++ b/tests/links004.html
@@ -567,7 +567,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links005.html b/tests/links005.html
index 6d8909ca3c..e2b368019a 100644
--- a/tests/links005.html
+++ b/tests/links005.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links006.html b/tests/links006.html
index 1abc0e95c5..884be4e3df 100644
--- a/tests/links006.html
+++ b/tests/links006.html
@@ -564,7 +564,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links007.html b/tests/links007.html
index b83ec6c4f4..84bf6837b4 100644
--- a/tests/links007.html
+++ b/tests/links007.html
@@ -691,7 +691,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/links008.html b/tests/links008.html
index 04a059d4ec..a6ac4888cc 100644
--- a/tests/links008.html
+++ b/tests/links008.html
@@ -408,7 +408,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/lint001.html b/tests/lint001.html
index b8e3477760..9128eedabc 100644
--- a/tests/lint001.html
+++ b/tests/lint001.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/macros001.html b/tests/macros001.html
index b697906992..4c673cb261 100644
--- a/tests/macros001.html
+++ b/tests/macros001.html
@@ -416,7 +416,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown001.html b/tests/markdown001.html
index 03b958b00e..fc339883ed 100644
--- a/tests/markdown001.html
+++ b/tests/markdown001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown002.html b/tests/markdown002.html
index b9da8cf554..2e76f173b2 100644
--- a/tests/markdown002.html
+++ b/tests/markdown002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown003.html b/tests/markdown003.html
index abcd8d0e1e..0352e977e0 100644
--- a/tests/markdown003.html
+++ b/tests/markdown003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown004.html b/tests/markdown004.html
index 4664965e2f..2c15fe04a8 100644
--- a/tests/markdown004.html
+++ b/tests/markdown004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown005.html b/tests/markdown005.html
index 362872dcba..4979a7446c 100644
--- a/tests/markdown005.html
+++ b/tests/markdown005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown006.html b/tests/markdown006.html
index af11ea47b9..05040ac628 100644
--- a/tests/markdown006.html
+++ b/tests/markdown006.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown007.html b/tests/markdown007.html
index 709b785445..af3277160b 100644
--- a/tests/markdown007.html
+++ b/tests/markdown007.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown008.html b/tests/markdown008.html
index 4d8751ffb4..633e02e109 100644
--- a/tests/markdown008.html
+++ b/tests/markdown008.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown009.html b/tests/markdown009.html
index 56f35df550..f88564f72c 100644
--- a/tests/markdown009.html
+++ b/tests/markdown009.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown010.html b/tests/markdown010.html
index b7fa7d0f39..9998204164 100644
--- a/tests/markdown010.html
+++ b/tests/markdown010.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown011.html b/tests/markdown011.html
index 96c8054d1a..a92dde6256 100644
--- a/tests/markdown011.html
+++ b/tests/markdown011.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown012.html b/tests/markdown012.html
index e65e497344..c6a6b2c669 100644
--- a/tests/markdown012.html
+++ b/tests/markdown012.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/markdown013.html b/tests/markdown013.html
index a8074ab999..5594359ebf 100644
--- a/tests/markdown013.html
+++ b/tests/markdown013.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/merge-metadata001.html b/tests/merge-metadata001.html
index d167bfa248..3aee65533f 100644
--- a/tests/merge-metadata001.html
+++ b/tests/merge-metadata001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata-expires001.html b/tests/metadata-expires001.html
index bce536ab6d..efe26a5f4b 100644
--- a/tests/metadata-expires001.html
+++ b/tests/metadata-expires001.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-expires002.html b/tests/metadata-expires002.html
index b08d631868..b1bdb4f19c 100644
--- a/tests/metadata-expires002.html
+++ b/tests/metadata-expires002.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-expires003.html b/tests/metadata-expires003.html
index 917632726e..46c3a9de7b 100644
--- a/tests/metadata-expires003.html
+++ b/tests/metadata-expires003.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-expires004.html b/tests/metadata-expires004.html
index e67fb89385..cdffc29066 100644
--- a/tests/metadata-expires004.html
+++ b/tests/metadata-expires004.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-expires005.html b/tests/metadata-expires005.html
index 9c6d7e6c0f..1e583ad4c8 100644
--- a/tests/metadata-expires005.html
+++ b/tests/metadata-expires005.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-expires006.html b/tests/metadata-expires006.html
index f71185c786..41e0cf7d5f 100644
--- a/tests/metadata-expires006.html
+++ b/tests/metadata-expires006.html
@@ -406,7 +406,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt class="editor">Editor:
diff --git a/tests/metadata-order001.html b/tests/metadata-order001.html
index 84acb3d864..910c85ba13 100644
--- a/tests/metadata-order001.html
+++ b/tests/metadata-order001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Test</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>Version History:
diff --git a/tests/metadata001.html b/tests/metadata001.html
index 79cfe0ae7b..c8a0a36895 100644
--- a/tests/metadata001.html
+++ b/tests/metadata001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata002.html b/tests/metadata002.html
index 158610f12d..0a8c4b7bdc 100644
--- a/tests/metadata002.html
+++ b/tests/metadata002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata003.html b/tests/metadata003.html
index d470ce2db2..a3ed1afbd4 100644
--- a/tests/metadata003.html
+++ b/tests/metadata003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata004.html b/tests/metadata004.html
index 6c915fdfc7..e95f79ffba 100644
--- a/tests/metadata004.html
+++ b/tests/metadata004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata005.html b/tests/metadata005.html
index bd69925d5f..bc465323dc 100644
--- a/tests/metadata005.html
+++ b/tests/metadata005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata006.html b/tests/metadata006.html
index b70487491b..a2c0a3113c 100644
--- a/tests/metadata006.html
+++ b/tests/metadata006.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata007.html b/tests/metadata007.html
index ab79b8d8b0..2f75b8ff4d 100644
--- a/tests/metadata007.html
+++ b/tests/metadata007.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata008.html b/tests/metadata008.html
index ddccae48ab..776f737bd2 100644
--- a/tests/metadata008.html
+++ b/tests/metadata008.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata009.html b/tests/metadata009.html
index 474ca513a9..4fac7aa6c6 100644
--- a/tests/metadata009.html
+++ b/tests/metadata009.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata010.html b/tests/metadata010.html
index 47bf1cc22c..c76a9c097f 100644
--- a/tests/metadata010.html
+++ b/tests/metadata010.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata011.html b/tests/metadata011.html
index 845afefa84..dc6c2a5ac5 100644
--- a/tests/metadata011.html
+++ b/tests/metadata011.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata012.html b/tests/metadata012.html
index 6ec280bc0c..5a94787c31 100644
--- a/tests/metadata012.html
+++ b/tests/metadata012.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata013.html b/tests/metadata013.html
index af8f50a336..d503dac992 100644
--- a/tests/metadata013.html
+++ b/tests/metadata013.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata014.html b/tests/metadata014.html
index df5460e233..4b5ba131b2 100644
--- a/tests/metadata014.html
+++ b/tests/metadata014.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata015.html b/tests/metadata015.html
index 904890884b..b1948382f7 100644
--- a/tests/metadata015.html
+++ b/tests/metadata015.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/metadata016.html b/tests/metadata016.html
index 67b3be5057..1617e05435 100644
--- a/tests/metadata016.html
+++ b/tests/metadata016.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/notes-examples001.html b/tests/notes-examples001.html
index 0e337bf3b7..65e10c0d9c 100644
--- a/tests/notes-examples001.html
+++ b/tests/notes-examples001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Notes</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/notes-issues001.html b/tests/notes-issues001.html
index e2ccf88be8..3a04f567bd 100644
--- a/tests/notes-issues001.html
+++ b/tests/notes-issues001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Notes</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/pre001.html b/tests/pre001.html
index 7d54513bd0..825bb00c78 100644
--- a/tests/pre001.html
+++ b/tests/pre001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/pre002.html b/tests/pre002.html
index 6d2f0b4916..cd19f52ac5 100644
--- a/tests/pre002.html
+++ b/tests/pre002.html
@@ -690,7 +690,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/pre003.html b/tests/pre003.html
index b265c11c89..4f5f7c66c7 100644
--- a/tests/pre003.html
+++ b/tests/pre003.html
@@ -611,7 +611,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/pre004.html b/tests/pre004.html
index 167e42e64c..f168f0fb6f 100644
--- a/tests/pre004.html
+++ b/tests/pre004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-001.html b/tests/previous-versions-001.html
index 8a69006945..8c1ea98ba4 100644
--- a/tests/previous-versions-001.html
+++ b/tests/previous-versions-001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-002.html b/tests/previous-versions-002.html
index 01c7c5511a..c8602b26f5 100644
--- a/tests/previous-versions-002.html
+++ b/tests/previous-versions-002.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-003.html b/tests/previous-versions-003.html
index 6e3d3db89a..51678f75e4 100644
--- a/tests/previous-versions-003.html
+++ b/tests/previous-versions-003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-004.html b/tests/previous-versions-004.html
index 32a9caa3ac..d30ec47fd7 100644
--- a/tests/previous-versions-004.html
+++ b/tests/previous-versions-004.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-005.html b/tests/previous-versions-005.html
index 544a7d8804..139e03b7f4 100644
--- a/tests/previous-versions-005.html
+++ b/tests/previous-versions-005.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-006.html b/tests/previous-versions-006.html
index 25651f80ae..243bb6c4e6 100644
--- a/tests/previous-versions-006.html
+++ b/tests/previous-versions-006.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/previous-versions-007.html b/tests/previous-versions-007.html
index 1d5867550e..31f104d63b 100644
--- a/tests/previous-versions-007.html
+++ b/tests/previous-versions-007.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/section-links001.html b/tests/section-links001.html
index d41f402a6c..9a24c7537c 100644
--- a/tests/section-links001.html
+++ b/tests/section-links001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Section Links</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/section-links002.html b/tests/section-links002.html
index 7152644ffb..887bd67dbc 100644
--- a/tests/section-links002.html
+++ b/tests/section-links002.html
@@ -531,7 +531,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Section Links With Weird HTML</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/section-links003.html b/tests/section-links003.html
index 6eb53ab25e..c3c5b35b7e 100644
--- a/tests/section-links003.html
+++ b/tests/section-links003.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1>Cross-Spec Section Links</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/tar-file001.html b/tests/tar-file001.html
index cbee5c7ee8..67d2e55524 100644
--- a/tests/tar-file001.html
+++ b/tests/tar-file001.html
@@ -446,7 +446,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">Foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/template.console.txt b/tests/template.console.txt
index e69de29bb2..f12ca0c830 100644
--- a/tests/template.console.txt
+++ b/tests/template.console.txt
@@ -0,0 +1 @@
+FATAL ERROR: Unknown Group 'WGNAMEORWHATEVER'. See docs for recognized Group values.
diff --git a/tests/template.html b/tests/template.html
index 9c4d9f05a1..bb8c304f44 100644
--- a/tests/template.html
+++ b/tests/template.html
@@ -3,7 +3,7 @@
   <meta content="text/html; charset=utf-8" http-equiv="Content-Type">
   <meta content="width=device-width, initial-scale=1, shrink-to-fit=no" name="viewport">
   <title>Your Spec Title</title>
-  <meta content="w3c/UD" name="w3c-status">
+  <meta content="UD" name="w3c-status">
   <link href="https://www.w3.org/StyleSheets/TR/2021/W3C-UD" rel="stylesheet">
   <link href="https://www.w3.org/2008/site/images/favicon.ico" rel="icon">
   <link href="http://example.com/url-this-spec-will-live-at" rel="canonical">
diff --git a/tests/var001.html b/tests/var001.html
index e8ffbbee75..fde266f0af 100644
--- a/tests/var001.html
+++ b/tests/var001.html
@@ -407,7 +407,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version:
diff --git a/tests/var002.html b/tests/var002.html
index 617dc4f7e7..cf54ad61e7 100644
--- a/tests/var002.html
+++ b/tests/var002.html
@@ -450,7 +450,7 @@
   <div class="head">
    <p data-fill-with="logo"></p>
    <h1 class="p-name no-ref" id="title">foo</h1>
-   <p id="w3c-state"><a href="https://www.w3.org/standards/types#LS">Living Standard</a>, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
+   <p>Living Standard, <time class="dt-updated" datetime="1970-01-01">1 January 1970</time></p>
    <div data-fill-with="spec-metadata">
     <dl>
      <dt>This version: