diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..ca18f6776
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..5fe0af526
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..d2507fa89
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..dcc3e3f8e
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42.otf
new file mode 100644
index 000000000..801a547d0
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..d2507fa89
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index 2b8cad73d..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf
deleted file mode 100644
index ba97353aa..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf
deleted file mode 100644
index d408c3782..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..70dd0fdc6
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..f9349f6f3
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..07e6ad538
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..070f9ec0d
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42.otf
new file mode 100644
index 000000000..60fd45c69
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..07e6ad538
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index f777566b4..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index f72508f23..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf
deleted file mode 100644
index 5d62e64e2..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf
deleted file mode 100644
index 51b4e83d2..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..8ecfac1a1
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,42.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..fc0dcbb2a
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..51340ddde
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,42.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..fc0dcbb2a
Binary files /dev/null and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index 0eea57d95..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 86b1f10fe..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf
deleted file mode 100644
index b7e772c0c..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index 86b1f10fe..000000000
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43,57.otf
similarity index 62%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43,57.otf
index c18249ba0..e939b0bcf 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43.otf
similarity index 60%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43.otf
index b6dd1b698..798b8565a 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42.otf
similarity index 61%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42.otf
index 03c4d3cee..a0d7fee1e 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,56,57.otf
similarity index 54%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,56,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,56,57.otf
index 426d122fe..68654ea0a 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41,56,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41.otf
similarity index 52%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41.otf
index 24e4af5d5..6e0aa21cf 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.42,57.otf
similarity index 50%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.42,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.42,57.otf
index 777307c1e..600edf9ab 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline-drop-hints.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test-retain-gids.42,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43,57.otf
similarity index 90%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43,57.otf
index cfa843f72..0606b0208 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43.otf
similarity index 83%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43.otf
index fd301b266..76fb186a0 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42.otf
similarity index 88%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42.otf
index 976b9ad95..13437bc86 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,56,57.otf
similarity index 82%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,56,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,56,57.otf
index 616985611..64e299ae7 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41,56,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41.otf
similarity index 79%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41.otf
index 6349f4ed4..ada8cb646 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.41.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.42,57.otf
similarity index 81%
rename from test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.42,57.otf
rename to test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.42,57.otf
index 011e22731..e38300e3f 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.notdef-outline.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.layout-test.42,57.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,43.otf
similarity index 77%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,43.otf
index 89b7a14ff..1e59c7588 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,46.otf
similarity index 78%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,46.otf
index 0516a86b0..67d882bde 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41.otf
similarity index 74%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41.otf
index 4aeeb9b5d..77ab03a2b 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.42,44.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.42,44.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.42,44.otf
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.43,46.otf
similarity index 74%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.43,46.otf
index bb610312a..148c9ca31 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.43,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 89%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.retain-all-codepoint.otf
index c43314f97..24f1c46dc 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,43.otf
similarity index 64%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,43.otf
index 3c1a62a8b..21a9b63ba 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,43.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,46.otf
similarity index 67%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,46.otf
index 6f1a6287b..78e4ab84b 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41.otf
similarity index 59%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41.otf
index 58785e364..8a17ae6f8 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.42,44.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.42,44.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.42,44.otf
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.43,46.otf
similarity index 60%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.43,46.otf
index 2a20ffe4a..354ace84d 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.43,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.retain-all-codepoint.otf
similarity index 89%
rename from test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.retain-all-codepoint.otf
index c43314f97..24f1c46dc 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23,25.otf
similarity index 70%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23,25.otf
index cfd5f2a48..1831de081 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23.otf
similarity index 70%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23.otf
index 60f432ce4..3c6c260ce 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.2E,23.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.2E,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.2E,23.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 79%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.retain-all-codepoint.otf
index f38da3681..a0471740d 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23,25.otf
similarity index 62%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23,25.otf
index 67bb640f7..e1f580b2a 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23.otf
similarity index 62%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23.otf
index 5e9b698d7..2fc6e5f98 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.2E,23.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.2E,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.2E,23.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.retain-all-codepoint.otf
similarity index 79%
rename from test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.retain-all-codepoint.otf
index f38da3681..a0471740d 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23,25.otf
new file mode 100644
index 000000000..2c67f99fa
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23.otf
new file mode 100644
index 000000000..267bec486
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.2E,23.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.2E,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.2E,23.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..b9c03f00b
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23,25.otf
new file mode 100644
index 000000000..693e784bf
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23.otf
new file mode 100644
index 000000000..2c0626a85
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.2E,23.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.2E,23.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.2E,23.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..b9c03f00b
Binary files /dev/null and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf
deleted file mode 100644
index cba4ceed0..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23,25.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf
deleted file mode 100644
index ebb924964..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.21,23.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 51ef75e1d..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf
deleted file mode 100644
index 73733a684..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23,25.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf
deleted file mode 100644
index 4bbe32c55..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.21,23.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index 51ef75e1d..000000000
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,29.otf
similarity index 69%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,29.otf
index 2404d85cd..4784f611e 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,29.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,2B.otf
similarity index 72%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,2B.otf
index 900cf1791..25ab8a057 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.28,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.29,2B.otf
similarity index 68%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.29,2B.otf
index bc1271773..f6225b2de 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.29,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.retain-all-codepoint.otf
index 2626fdcbd..308dcb8b7 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,29.otf
similarity index 60%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,29.otf
index 3474f06f1..1111175aa 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,29.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,2B.otf
similarity index 64%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,2B.otf
index d1321c7e3..a0f56c91a 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.28,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.29,2B.otf
similarity index 63%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.29,2B.otf
index cec2a1660..9e882c1be 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.29,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.retain-all-codepoint.otf
index f3cb04507..308dcb8b7 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,44.otf
new file mode 100644
index 000000000..af2af9f1d
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,45.otf
new file mode 100644
index 000000000..9a74dd1b4
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43.otf
similarity index 53%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43.otf
index 7aac0d992..2c72badc0 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,42.otf
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44,45,46.otf
similarity index 51%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44,45,46.otf
index 3a4ce942d..9c0853bab 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44.otf
new file mode 100644
index 000000000..5f5797519
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,45.otf
new file mode 100644
index 000000000..3dcc084f6
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43.otf
similarity index 53%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43.otf
index 71a93e585..ada1a5471 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 81%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.retain-all-codepoint.otf
index 56dd49ea1..8dd5444f7 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,44.otf
new file mode 100644
index 000000000..58889d679
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,45.otf
new file mode 100644
index 000000000..8c0c211d2
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..3aff353d2
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,42.otf
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44,45,46.otf
similarity index 50%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44,45,46.otf
index 4142387f4..977675835 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44.otf
new file mode 100644
index 000000000..bc0607008
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,45.otf
new file mode 100644
index 000000000..3d87498fb
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43.otf
new file mode 100644
index 000000000..fc99dd804
Binary files /dev/null and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.retain-all-codepoint.otf
similarity index 81%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.retain-all-codepoint.otf
index 56dd49ea1..8dd5444f7 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf
deleted file mode 100644
index 104114234..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,44.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index f4290a3c9..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf
deleted file mode 100644
index b7116f097..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf
deleted file mode 100644
index 9ea5415cc..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,44.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf
deleted file mode 100644
index 13fde34af..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf
deleted file mode 100644
index 26fe3474e..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf
deleted file mode 100644
index 839256c71..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf
deleted file mode 100644
index c976e0f40..000000000
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,44.otf
similarity index 56%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,44.otf
index 08de422b6..0313313aa 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,45.otf
similarity index 65%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,45.otf
index 7137efd83..99116b4e5 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..564d0c5fc
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,44.otf
similarity index 53%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,44.otf
index 603980aa1..1dcc5bdd4 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,45.otf
new file mode 100644
index 000000000..9c330c74c
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..1965933ba
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.42.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.42.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.retain-all-codepoint.otf
index 866d06e24..ca8eeba44 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,44.otf
similarity index 61%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,44.otf
index eb06c2016..6ff7711b1 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,45.otf
new file mode 100644
index 000000000..bf8265e9d
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..8f41e9695
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,44.otf
similarity index 57%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,44.otf
index 65f847c67..63d5b1a3c 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,45.otf
new file mode 100644
index 000000000..2d5de06aa
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42.otf
new file mode 100644
index 000000000..aecd96ae7
Binary files /dev/null and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.42.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.42.otf
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.retain-all-codepoint.otf
index 866d06e24..ca8eeba44 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf
deleted file mode 100644
index 9a31fb7cb..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index 701368cbc..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf
deleted file mode 100644
index c8564a5e8..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index 43a79ad62..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf
deleted file mode 100644
index 7be86edf3..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf
deleted file mode 100644
index 08935ff31..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf
deleted file mode 100644
index cc4936085..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf
deleted file mode 100644
index e8e5eb263..000000000
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,44.otf
similarity index 50%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,44.otf
index 1b2aa637c..8f46239ef 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,45.otf
new file mode 100644
index 000000000..e1ae2bc1c
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43.otf
similarity index 65%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43.otf
index ff84499bb..42b332e38 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,42.otf
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44,45,46.otf
similarity index 58%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44,45,46.otf
index 5a0fa7dc8..3e9f1e797 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44.otf
similarity index 67%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44.otf
index 4bd60da7d..ea47831bd 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,45.otf
similarity index 65%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,45.otf
index e1f14e980..79206e882 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline-retain-gids.41,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43.otf
new file mode 100644
index 000000000..db066b7c8
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 82%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.retain-all-codepoint.otf
index 0e64ef6b0..59c911d72 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,44.otf
similarity index 53%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,44.otf
index 5410ee680..b4d50a95b 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,45.otf
new file mode 100644
index 000000000..e39e1b9c5
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43.otf
new file mode 100644
index 000000000..a328c7ed8
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,42.otf
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44,45,46.otf
similarity index 60%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44,45,46.otf
index 3f2ce1274..21b19831c 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44.otf
similarity index 52%
rename from test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44.otf
index 8fdbc37ff..c23f81b18 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.notdef-outline.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,45.otf
new file mode 100644
index 000000000..69b2e4635
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43.otf
new file mode 100644
index 000000000..d533fa072
Binary files /dev/null and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.retain-all-codepoint.otf
similarity index 82%
rename from test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.retain-all-codepoint.otf
index 0e64ef6b0..59c911d72 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf
deleted file mode 100644
index 5cc28c5cd..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,42,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf
deleted file mode 100644
index 21255770f..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,44.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf
deleted file mode 100644
index 25c803f3b..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline-retain-gids.41,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf
deleted file mode 100644
index 52d8d10d7..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf
deleted file mode 100644
index a21985f0e..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf
deleted file mode 100644
index 96d50f6c9..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,44.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf
deleted file mode 100644
index e7aa903ea..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43,45.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf
deleted file mode 100644
index b493c293e..000000000
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.notdef-outline.41,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
new file mode 100644
index 000000000..445f56768
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..f1d3e4326
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf
new file mode 100644
index 000000000..bc47f58b8
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..f1d3e4326
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
deleted file mode 100644
index ec86121e2..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
deleted file mode 100644
index f985ff56b..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
new file mode 100644
index 000000000..77f9ce01d
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..7d4dea0b2
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf
new file mode 100644
index 000000000..e57101a17
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..7d4dea0b2
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
deleted file mode 100644
index c85e30b39..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
deleted file mode 100644
index 210a26361..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.30,31,32,33.otf
new file mode 100644
index 000000000..09452d964
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..554fb54f0
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.30,31,32,33.otf
new file mode 100644
index 000000000..f72d0cc6a
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..554fb54f0
Binary files /dev/null and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf
deleted file mode 100644
index e26e61dbe..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index cdb899f45..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf
deleted file mode 100644
index da47accc5..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index cdb899f45..000000000
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..c382ed2c9
Binary files /dev/null and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41.otf
similarity index 74%
rename from test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41.otf
index e43a0268f..0ff63b906 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.42.otf
similarity index 72%
rename from test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf
rename to test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.42.otf
index e1706ebfe..7981553b0 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test-retain-gids.42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41,42.otf
new file mode 100644
index 000000000..f2406c50c
Binary files /dev/null and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41.otf
similarity index 58%
rename from test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41.otf
index 6e2775cf3..32f8025b7 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.42.otf
similarity index 54%
rename from test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf
rename to test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.42.otf
index 5fd086cc7..da4581202 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.layout-test.42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index 3e4e03b0a..000000000
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf
deleted file mode 100644
index 5a0da702d..000000000
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf
deleted file mode 100644
index 5cd84a042..000000000
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf
deleted file mode 100644
index 1492cd0f6..000000000
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf
similarity index 53%
rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf
rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf
index f758958b0..9a58feee6 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf
new file mode 100644
index 000000000..c5c9146ce
Binary files /dev/null and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf
new file mode 100644
index 000000000..1b11e10d0
Binary files /dev/null and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 64%
rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.retain-all-codepoint.otf
index 38e53bc68..7249c5ab7 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf
similarity index 53%
rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf
rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf
index 13c7478a3..91357c97f 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf
new file mode 100644
index 000000000..df08b73ff
Binary files /dev/null and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf
new file mode 100644
index 000000000..39da89b55
Binary files /dev/null and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.retain-all-codepoint.otf
similarity index 63%
rename from test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.retain-all-codepoint.otf
index 66ef86cae..51afa40e7 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf
deleted file mode 100644
index 848c41c88..000000000
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf
deleted file mode 100644
index 45c352eb3..000000000
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..ed8a98bca
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..688ad21d9
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf
index f7d4d9ce1..0ff250ba1 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42,43.otf
new file mode 100644
index 000000000..bde0da125
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42.otf
new file mode 100644
index 000000000..3e2a6a76b
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.retain-all-codepoint.otf
index f7d4d9ce1..0ff250ba1 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index 51184892f..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index 6411b6f5d..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 5ab176df5..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf
deleted file mode 100644
index 70e97347a..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf
deleted file mode 100644
index cc8183d86..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index 5ab176df5..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf
new file mode 100644
index 000000000..1d3f3cd70
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42.otf
new file mode 100644
index 000000000..00dbfea8d
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf
index 89505ad5b..b3d6ae9e4 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42,43.otf
new file mode 100644
index 000000000..0a693c641
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42.otf
new file mode 100644
index 000000000..656a088c4
Binary files /dev/null and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.retain-all-codepoint.otf
similarity index 78%
rename from test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.retain-all-codepoint.otf
index 89505ad5b..b3d6ae9e4 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf
deleted file mode 100644
index 0b7d0f069..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf
deleted file mode 100644
index 6f32aca35..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 5c6b3d94a..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf
deleted file mode 100644
index b96e59087..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42,43.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf
deleted file mode 100644
index cd193d46a..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.41,42.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index 5c6b3d94a..000000000
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,42.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,42.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.retain-all-codepoint.otf
index f3cb04507..fd6065795 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,42.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,42.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,42.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41,43.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.retain-all-codepoint.otf
index 2626fdcbd..fd6065795 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
similarity index 77%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
index 63bf2a587..c38bb1848 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
index 814f1b716..be5c742fd 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf
similarity index 72%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf
index 924389bd4..9c6cf1882 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
index 814f1b716..be5c742fd 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index e71daf267..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index e71daf267..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
similarity index 50%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf
index e1cfd7aaf..e5b9d6ea2 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf
new file mode 100644
index 000000000..3072df621
Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf
new file mode 100644
index 000000000..ef1bc2d63
Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf
new file mode 100644
index 000000000..3072df621
Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index 19b4f680b..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf
deleted file mode 100644
index 5d29d6923..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index 19b4f680b..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.30,31,32,33.otf
new file mode 100644
index 000000000..eb573b022
Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.retain-all-codepoint.otf
index cf2d7633b..73d92d40d 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.30,31,32,33.otf
new file mode 100644
index 000000000..16d2b34f9
Binary files /dev/null and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.retain-all-codepoint.otf
similarity index 80%
rename from test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.retain-all-codepoint.otf
index cf2d7633b..73d92d40d 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf
deleted file mode 100644
index 36fe04cd1..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf
deleted file mode 100644
index ea47f906d..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline-retain-gids.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf
deleted file mode 100644
index 5e68383bd..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.30,31,32,33.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf
deleted file mode 100644
index ea47f906d..000000000
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.notdef-outline.retain-all-codepoint.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47,48,49.otf
similarity index 58%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47,48,49.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47,48,49.otf
index 3ca802053..4e0b307a4 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47,48,49.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47,48,49.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47.otf
new file mode 100644
index 000000000..28bc409b8
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,47.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,4D.otf
new file mode 100644
index 000000000..90e1cdf76
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,4D.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,51.otf
similarity index 53%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,51.otf
index 57747531c..1b07a7a06 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,47.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46,51.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43,44,45,46.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.41.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.61.otf
new file mode 100644
index 000000000..275b11be4
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.61.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.retain-all-codepoint.otf
similarity index 82%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.retain-all-codepoint.otf
index f6e312da1..d29304c48 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47,48,49.otf
similarity index 61%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47,48,49.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47,48,49.otf
index 8646c6aff..f149bbff8 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47,48,49.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47,48,49.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47.otf
similarity index 50%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,51.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47.otf
index cf572533d..3475f4e58 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,51.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,47.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,4D.otf
new file mode 100644
index 000000000..8e8c4de44
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,4D.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,51.otf
new file mode 100644
index 000000000..cd519a58f
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46,51.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43,44,45,46.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41,42,43.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41.otf
similarity index 100%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.41.otf
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.61.otf
new file mode 100644
index 000000000..ec09bf01f
Binary files /dev/null and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.61.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.retain-all-codepoint.otf
similarity index 82%
rename from test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.retain-all-codepoint.otf
rename to test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.retain-all-codepoint.otf
index f6e312da1..d29304c48 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.layout-test.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,4D.otf
deleted file mode 100644
index 2426e4b80..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,4D.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,51.otf
deleted file mode 100644
index fc68d33e4..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.41,42,43,44,45,46,51.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.61.otf
deleted file mode 100644
index 135afb133..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline-retain-gids.61.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47.otf
deleted file mode 100644
index dc46be621..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,47.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,4D.otf
deleted file mode 100644
index 230bbc628..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.41,42,43,44,45,46,4D.otf and /dev/null differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.61.otf
deleted file mode 100644
index 0d0a67725..000000000
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.notdef-outline.61.otf and /dev/null differ
diff --git a/test/subset/data/profiles/layout-test-retain-gids.txt b/test/subset/data/profiles/layout-test-retain-gids.txt
new file mode 100644
index 000000000..63c67eb97
--- /dev/null
+++ b/test/subset/data/profiles/layout-test-retain-gids.txt
@@ -0,0 +1,3 @@
+--layout-features=*
+--notdef-outline
+--retain-gids
diff --git a/test/subset/data/profiles/layout-test.txt b/test/subset/data/profiles/layout-test.txt
new file mode 100644
index 000000000..d98633a00
--- /dev/null
+++ b/test/subset/data/profiles/layout-test.txt
@@ -0,0 +1,2 @@
+--layout-features=*
+--notdef-outline
diff --git a/test/subset/data/tests/layout.context.tests b/test/subset/data/tests/layout.context.tests
index 673bba734..dacd55539 100644
--- a/test/subset/data/tests/layout.context.tests
+++ b/test/subset/data/tests/layout.context.tests
@@ -4,8 +4,8 @@ gpos_context2_multiple_subrules_f1.otf
 gpos_context3_simple_f1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gdef-varstore.tests b/test/subset/data/tests/layout.gdef-varstore.tests
index b3b7c03fc..45b9065f0 100644
--- a/test/subset/data/tests/layout.gdef-varstore.tests
+++ b/test/subset/data/tests/layout.gdef-varstore.tests
@@ -2,8 +2,8 @@ FONTS:
 AdobeVFPrototype.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-drop-hints.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gpos.tests b/test/subset/data/tests/layout.gpos.tests
index ef2384b12..a6d3b83cd 100644
--- a/test/subset/data/tests/layout.gpos.tests
+++ b/test/subset/data/tests/layout.gpos.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos1_2_font.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gpos2.tests b/test/subset/data/tests/layout.gpos2.tests
index 6a07db9e4..98c9c924f 100644
--- a/test/subset/data/tests/layout.gpos2.tests
+++ b/test/subset/data/tests/layout.gpos2.tests
@@ -3,8 +3,8 @@ gpos2_1_font7.otf
 gpos2_2_font5.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 !#
diff --git a/test/subset/data/tests/layout.gpos3.tests b/test/subset/data/tests/layout.gpos3.tests
index 9322b58df..7a129df66 100644
--- a/test/subset/data/tests/layout.gpos3.tests
+++ b/test/subset/data/tests/layout.gpos3.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos3_font3.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 ()
diff --git a/test/subset/data/tests/layout.gpos4.tests b/test/subset/data/tests/layout.gpos4.tests
index eace6c252..307a877b9 100644
--- a/test/subset/data/tests/layout.gpos4.tests
+++ b/test/subset/data/tests/layout.gpos4.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos4_multiple_anchors_1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gpos5.tests b/test/subset/data/tests/layout.gpos5.tests
index 12caf6abe..490e34ef0 100644
--- a/test/subset/data/tests/layout.gpos5.tests
+++ b/test/subset/data/tests/layout.gpos5.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos5_font1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gpos6.tests b/test/subset/data/tests/layout.gpos6.tests
index 94cf8105f..27202d209 100644
--- a/test/subset/data/tests/layout.gpos6.tests
+++ b/test/subset/data/tests/layout.gpos6.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos6_font1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gpos8.tests b/test/subset/data/tests/layout.gpos8.tests
index 7367ce3eb..5ba9db082 100644
--- a/test/subset/data/tests/layout.gpos8.tests
+++ b/test/subset/data/tests/layout.gpos8.tests
@@ -4,8 +4,8 @@ gpos_chaining2_multiple_subrules_f1.otf
 gpos_chaining3_simple_f1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 0123
diff --git a/test/subset/data/tests/layout.gpos9.tests b/test/subset/data/tests/layout.gpos9.tests
index 0750ca079..e1fd9280f 100644
--- a/test/subset/data/tests/layout.gpos9.tests
+++ b/test/subset/data/tests/layout.gpos9.tests
@@ -2,8 +2,8 @@ FONTS:
 gpos9_font2.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gsub3.tests b/test/subset/data/tests/layout.gsub3.tests
index 8f98f63b7..35d02fb22 100644
--- a/test/subset/data/tests/layout.gsub3.tests
+++ b/test/subset/data/tests/layout.gsub3.tests
@@ -2,8 +2,8 @@ FONTS:
 gsub_alternate_substitution.otf
 
 PROFILES:
-default.txt
-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 厩
diff --git a/test/subset/data/tests/layout.gsub5.tests b/test/subset/data/tests/layout.gsub5.tests
index f5610c4bf..152a0376a 100644
--- a/test/subset/data/tests/layout.gsub5.tests
+++ b/test/subset/data/tests/layout.gsub5.tests
@@ -4,8 +4,8 @@ gsub_context2_multiple_subrules_f2.otf
 gsub_context3_successive_f1.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 A
diff --git a/test/subset/data/tests/layout.gsub6.tests b/test/subset/data/tests/layout.gsub6.tests
index afd078193..755f71d35 100644
--- a/test/subset/data/tests/layout.gsub6.tests
+++ b/test/subset/data/tests/layout.gsub6.tests
@@ -4,8 +4,8 @@ gsub_chaining2_multiple_subrules_f1.otf
 gsub_chaining3_simple_f2.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 0123
diff --git a/test/subset/data/tests/layout.gsub8.tests b/test/subset/data/tests/layout.gsub8.tests
index f70d307ea..dc17be437 100644
--- a/test/subset/data/tests/layout.gsub8.tests
+++ b/test/subset/data/tests/layout.gsub8.tests
@@ -2,8 +2,8 @@ FONTS:
 gsub8_manually_created.otf
 
 PROFILES:
-notdef-outline.txt
-notdef-outline-retain-gids.txt
+layout-test.txt
+layout-test-retain-gids.txt
 
 SUBSETS:
 a