Address comments
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/README.md b/html/semantics/forms/the-fieldset-element/accessibility/README.md
index ba830d8..b238a02 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/README.md
+++ b/html/semantics/forms/the-fieldset-element/accessibility/README.md
@@ -5,7 +5,7 @@
To run these tests, open the browser's developer tools and navigate to the Accessibility pane (may
need to activate it in Settings), or use an OS-level accessibility inspector, and verify that the
-accessible name matches the expected accessible name.
+accessible name/role matches the expected accessible name/role.
The following issue discusses ways to automate these tests:
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html
index e806198..c61d627 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/aria-manual.html
@@ -1,7 +1,7 @@
<!doctype html>
<title>fieldset accessibility test: ARIA</title>
-<div role=group aria-labelledby=legend>
+<div id=fieldset role=group aria-labelledby=legend>
<div id=legend>Foo</div>
<input>
</div>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html
index c0be1db..2ee1ab2 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/baseline-manual.html
@@ -1,7 +1,8 @@
<!doctype html>
<title>fieldset accessibility test: baseline</title>
-<fieldset>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html
index cdd494a..dbc4edc 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-appearance-none-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: fieldset -webkit-appearance: none</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
fieldset { -webkit-appearance: none; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html
index 5a419f4..943a030 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-contents-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: fieldset display: contents</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
fieldset { display: contents; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html
new file mode 100644
index 0000000..b455760
--- /dev/null
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-display-none-manual.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>fieldset accessibility test: fieldset display: none</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<style>
+ fieldset { display: none; }
+</style>
+<fieldset id=fieldset>
+ <legend>Foo</legend>
+ <input>
+</fieldset>
+<p>Expected no accessible node for id=fieldset.
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html
index 346851a..2eb01f2 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-div-display-contents-manual.html
@@ -1,12 +1,13 @@
<!doctype html>
<title>fieldset accessibility test: fieldset div display: contents</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
div { display: contents; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<div>
<legend>Foo</legend>
<input>
</div>
</fieldset>
-<p>Expected accessible name: ""
+<p>Expected accessible name for id=fieldset: ""
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html
index 7563f5a..4638a2b 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-none-manual.html
@@ -1,7 +1,8 @@
<!doctype html>
<title>fieldset accessibility test: fieldset role=none</title>
-<fieldset role=none>
+<link rel=help href=http://w3c.github.io/aria/#none>
+<fieldset id=fieldset role=none>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected no accessible node for the fieldset.
+<p>Expected no accessible node for id=fieldset.
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html
index 87e2c5e..e1360d2 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-role-presentation-manual.html
@@ -1,7 +1,8 @@
<!doctype html>
-<title>fieldset accessibility test: fieldset role=none</title>
-<fieldset role=presentation>
+<title>fieldset accessibility test: fieldset role=presentation</title>
+<link rel=help href=http://w3c.github.io/aria/#presentation>
+<fieldset id=fieldset role=presentation>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected no accessible node for the fieldset.
+<p>Expected no accessible node for id=fieldset.
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html
new file mode 100644
index 0000000..a3dd273
--- /dev/null
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-collapse-manual.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>fieldset accessibility test: fieldset visibility: collapse</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<style>
+ fieldset { visibility: collapse; }
+</style>
+<fieldset id=fieldset>
+ <legend>Foo</legend>
+ <input>
+</fieldset>
+<p>Expected no accessible node for id=fieldset.
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html
new file mode 100644
index 0000000..894f00a
--- /dev/null
+++ b/html/semantics/forms/the-fieldset-element/accessibility/fieldset-visibility-hidden-manual.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<title>fieldset accessibility test: fieldset visibility: hidden</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<style>
+ fieldset { visibility: hidden; }
+ legend, input { visibility: visible; }
+</style>
+<fieldset id=fieldset>
+ <legend>Foo</legend>
+ <input>
+</fieldset>
+<p>Expected no accessible node for id=fieldset.
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html
index 25efd74..2d3d2a9 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/flexbox-manual.html
@@ -1,12 +1,13 @@
<!doctype html>
<title>fieldset accessibility test: flexbox</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
fieldset { display: flex; }
legend { float: left; flex: auto; }
input { display: block; flex: auto; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html
index c687493..9d966d0 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/grid-manual.html
@@ -1,11 +1,12 @@
<!doctype html>
<title>fieldset accessibility test: grid</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
fieldset { display: grid; grid-template-columns: auto auto; }
legend { float: left; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html
index e389c46..019e63f 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-abspos-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: position: absolute legend</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend { position: absolute; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html
index 91f162e..bc5d9fb 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-child-display-none-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: legend child display: none</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend > span { display: none; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo<span>Bar</span></legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html
index 559039d..01ceb9e 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-child-visibility-hidden-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: legend visibility: hidden</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend > span { visibility: hidden; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo<span>Bar</span></legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html
index 377fca7..f9fd1a3 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-display-contents-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: legend display: contents</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend { display: contents; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html
index e0fad9c..14060b9 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-display-none-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: legend display: none</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend { display: none; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: ""
+<p>Expected accessible name for id=fieldset: ""
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html
index 026e24e..40f2c4a 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-float-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: floating legend</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend { float: left; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html
index 875a937..e15ff4d 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-role-group-manual.html
@@ -1,7 +1,8 @@
<!doctype html>
<title>fieldset accessibility test: legend role=group aria-labelledby=fieldset</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<fieldset id=fieldset>
<legend role=group aria-labelledby=fieldset>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: ""
+<p>Expected accessible name for id=fieldset: ""
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html
new file mode 100644
index 0000000..c44bb1e
--- /dev/null
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-collapse-manual.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<title>fieldset accessibility test: legend visibility: collapse</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<style>
+ legend { visibility: collapse; }
+</style>
+<fieldset id=fieldset>
+ <legend>Foo</legend>
+ <input>
+</fieldset>
+<p>Expected accessible name for id=fieldset: ""
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html
index 173ce6d..f989712 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/legend-visibility-hidden-manual.html
@@ -1,10 +1,11 @@
<!doctype html>
<title>fieldset accessibility test: legend visibility: hidden</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<style>
legend { visibility: hidden; }
</style>
-<fieldset>
+<fieldset id=fieldset>
<legend>Foo</legend>
<input>
</fieldset>
-<p>Expected accessible name: ""
+<p>Expected accessible name for id=fieldset: ""
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html
index 6192aad..5d25317 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/multiple-legends-manual.html
@@ -1,8 +1,10 @@
<!doctype html>
<title>fieldset accessibility test: multiple legends</title>
-<fieldset>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<fieldset id=fieldset>
+ <div></div>
<legend>Foo</legend>
<legend>Bar</legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html
new file mode 100644
index 0000000..d09c203
--- /dev/null
+++ b/html/semantics/forms/the-fieldset-element/accessibility/role-manual.html
@@ -0,0 +1,8 @@
+<!doctype html>
+<title>fieldset accessibility test: role</title>
+<fieldset id=fieldset>
+ <legend id=legend>Foo</legend>
+ <input>
+</fieldset>
+<p>Expected accessible role for id=fieldset: "group"
+<p>Expected accessible role for id=legend: No corresponding role
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html
index 0e05807..bb93d07 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/shadow-dom-manual.html
@@ -1,7 +1,8 @@
<!DOCTYPE html>
<title>fieldset accessibility test: shadow DOM</title>
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
<template id="my-fieldset">
- <fieldset>
+ <fieldset id=fieldset>
<slot name="my-text"></slot>
<input>
</fieldset>
@@ -11,7 +12,7 @@
<legend slot="my-text">Foo</legend>
</my-fieldset>
-<p>Expected accessible name: ""
+<p>Expected accessible name for id=fieldset: ""
<script>
customElements.define('my-fieldset',
diff --git a/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html b/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html
index 9757933..0169a51 100644
--- a/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html
+++ b/html/semantics/forms/the-fieldset-element/accessibility/title-attribute-and-empty-legend-manual.html
@@ -1,7 +1,8 @@
<!doctype html>
<title>fieldset accessibility test: title attribute and empty legend</title>
-<fieldset title="Foo">
+<link rel=help href=https://w3c.github.io/html-aam/#fieldset-element-accessible-name-computation>
+<fieldset id=fieldset title="Foo">
<legend></legend>
<input>
</fieldset>
-<p>Expected accessible name: "Foo"
+<p>Expected accessible name for id=fieldset: "Foo"
