diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf
index ef1f93881..8231f77a8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf
index caa64e8d3..3f3eb7a3c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf
index 8639abaa8..79d3d6053 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf
index 0a6b79847..8cb0157fa 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf
index 9e43837e3..b5fe2adfe 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf
index 92a8c8582..861022e7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.default.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf
index ffc508b03..554bee04f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf
index 02ecd01d5..a267c905b 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf
index c1f411a7a..0bc4f0852 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf
index 329d3845c..2f20c55b9 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf
index 2c3942dc0..51efb92b8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf
index f5ac58da7..3e8963204 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints-retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf
index ce7608085..7b65d7cf9 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf
index ba0a46473..7cd4d242c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf
index 7efbfafd8..789ad1945 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf
index 325ac0409..12f9e05fc 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf
index 46886aaf6..3ffcc9d7a 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf
index 7bde49359..d6b09c8ed 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.drop-hints.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf
index dad00bc41..21aaaea7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf
index 429eeeb1c..ec41762c5 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf
index 08dcdcd0c..d21d5637e 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf
index 653bb2416..963ac0449 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf
index fd9565cc5..1d941c022 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf
index 92a8c8582..861022e7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,62,63.ttf
index 3a0c14989..b36c2a68b 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,63.ttf
index f748fbcf0..cac1151ea 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61.ttf
index 2f5654909..2d05da33e 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.62.ttf
index 831fa96b6..6125ac5eb 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.63.ttf
index 2df55a7ea..b5a9cc088 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.retain-all-codepoint.ttf
index d89c501f1..c29c8abf5 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.glyph-names.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,62,63.ttf
index 44cd03ce2..99233696c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,63.ttf
index 04b23949e..244ac58c1 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61.ttf
index a3d33558b..3b0c9cb1d 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.62.ttf
index 0a6b79847..8cb0157fa 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.63.ttf
index 9e43837e3..b5fe2adfe 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.retain-all-codepoint.ttf
index 109d32f16..e3a3d2ec0 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.keep-all-layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,62,63.ttf
index ef1f93881..8231f77a8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,63.ttf
index caa64e8d3..3f3eb7a3c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61.ttf
index 8639abaa8..79d3d6053 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.62.ttf
index 0a6b79847..8cb0157fa 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.63.ttf
index 9e43837e3..b5fe2adfe 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.retain-all-codepoint.ttf
index e5360a705..3594a874d 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf
index a6f61f9e6..70eef4e0c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf
index 8b0726295..f02b808b5 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf
index 9c225fd29..d313274b8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf
index 3286c2ee8..1c0b9da61 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf
index bdbea45ae..a2d37e55a 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf
index 000c7c81c..c4a3d3129 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-ids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf
index ef1f93881..8231f77a8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf
index caa64e8d3..3f3eb7a3c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf
index 8639abaa8..79d3d6053 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf
index 0a6b79847..8cb0157fa 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf
index 9e43837e3..b5fe2adfe 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf
index 92a8c8582..861022e7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-languages.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf
index ef1f93881..8231f77a8 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf
index caa64e8d3..3f3eb7a3c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf
index 8639abaa8..79d3d6053 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf
index 0a6b79847..8cb0157fa 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf
index 9e43837e3..b5fe2adfe 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf
index 92a8c8582..861022e7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.name-legacy.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,62,63.ttf
index b57dfc824..b459df1e9 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,63.ttf
index 001e8378c..c41669445 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61.ttf
index 4ef564582..312e60bfd 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.62.ttf
index 1864c034b..3d6eb431c 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.63.ttf
index 90917545e..8846c39fd 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.retain-all-codepoint.ttf
index 92a8c8582..861022e7f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.no-prune-unicode-ranges.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,62,63.ttf
index 9c6b70fca..543359993 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,63.ttf
index 3f139a68d..74d8aaca2 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61.ttf
index 4d931ad66..dbaab7620 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.62.ttf
index 0f95a1e9e..a5664add4 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.63.ttf
index 23a8777d6..9d31f858d 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.retain-all-codepoint.ttf
index 0db4b2ab4..af3ef8a56 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.notdef-outline.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf
index 300694bb9..706afafe0 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf
index 74cef89dc..af8853720 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf
index 2fc079761..d07aa5d0f 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf
index 983e20574..f2fb8893b 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf
index cfc533881..7830ff4c1 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf
index 87b2c15c2..ccdd46e35 100644
Binary files a/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Comfortaa-Regular-new.retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.default.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,62,63.ttf
index bf8264b44..ed156518a 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,63.ttf
index c64172a76..b1dbaa795 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61.ttf
index 9b261449d..a34169ead 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.62.ttf
index d737cd79b..0ca5e29dc 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.63.ttf
index 5e4d49477..e5d130641 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.retain-all-codepoint.ttf
index 892ccb8ea..1db3d932c 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints-retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,62,63.ttf
index bf8264b44..ed156518a 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,63.ttf
index bc54940a3..87b8c7a57 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61.ttf
index 9b261449d..a34169ead 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.62.ttf
index 32cf9f7da..1e07ff43f 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.63.ttf
index 776e758f0..e1839f72d 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.retain-all-codepoint.ttf
index 892ccb8ea..1db3d932c 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.drop-hints.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.62.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.glyph-names.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.keep-all-layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,62,63.ttf
index a7af97390..0c7ecf571 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,63.ttf
index ac780dbb9..b63740d6d 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61.ttf
index c4321d1bc..63c9d0d73 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.62.ttf
index 4c553ca79..f9687b38e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.63.ttf
index 5234b742e..8c0227ce5 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.retain-all-codepoint.ttf
index 9d225419f..6ef56ed9e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-ids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,62,63.ttf
index 9bb2a9d1f..ee60f0a3d 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,63.ttf
index 7373aa3be..4254cd587 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61.ttf
index 26fe19eab..d1853854e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.62.ttf
index 02cd27022..dc04ce17f 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.63.ttf
index 64a892e43..9b9ab44d7 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.retain-all-codepoint.ttf
index d5d423810..6907423e3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-languages.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.name-legacy.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,62,63.ttf
index 9b0a9e411..d36a7a829 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,63.ttf
index 432b3b20f..e0e199a7e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61.ttf
index d2402b475..d5b788253 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.62.ttf
index 907e8f76f..5c9988b32 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.63.ttf
index 741520c3a..69f61a7b0 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.no-prune-unicode-ranges.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,63.ttf
index 5913420e3..5771674c3 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.62.ttf
index 91fcad84a..315b882aa 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.63.ttf
index 737cbdc7e..b5aa59a84 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.notdef-outline.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,62,63.ttf
index dbed582fb..8f652e0db 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,63.ttf
index 47e72c6a3..85f3ade4e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61.ttf
index 3635f68be..b568b09f1 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.62.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.62.ttf
index 57f7ec769..4409d8696 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.62.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.63.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.63.ttf
index d0426a0d5..931c4140e 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.63.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.retain-all-codepoint.ttf
index 9744bc31d..c660fc010 100644
Binary files a/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/NanumMyeongjo-Regular-subset.retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.default.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf
index e55c73487..2afff63b8 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf
index b8b5cbedd..e6663ba75 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf
index 5e65b8568..668e22891 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf
index d2c5b79b4..537b51351 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf
index e9cc364b2..aafcd2966 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf
index e55c73487..2afff63b8 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints-retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf
index e55c73487..2afff63b8 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf
index 55a63e7ef..6478c431b 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf
index 5e65b8568..668e22891 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf
index 27a579fa9..091730b70 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf
index bcd194dfa..354ea4868 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf
index e55c73487..2afff63b8 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.drop-hints.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.glyph-names.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.keep-all-layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.layout-features.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-ids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-languages.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.name-legacy.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf
index 691ce2e24..abf6b1023 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf
index 97913a4a5..e4ab123d8 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf
index 085db0235..d1acd4ca4 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.no-prune-unicode-ranges.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf
index f4b4a0852..734dff791 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf
index a2916f82b..a57037303 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf
index e3964f8e9..5b29833e9 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.notdef-outline.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,62,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf
index 89abe99f2..b5adb409d 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61,63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf
index 60e3c5cbb..c338dface 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.61.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf
index aab73fd8c..78efd559a 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.62.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf
index 0946e02c3..6317102c5 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.63.ttf differ
diff --git a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf
index 712674fa2..ccd47a040 100644
Binary files a/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf and b/test/subset/data/expected/basics/Roboto-Regular.abc.retain-gids.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf
index b577752ae..ac7cc4701 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf
index 6f4814cc5..b697e6dd3 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf
index 1872d24b1..2332177d3 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,39,AE,2049,38,20E3.ttf
index 14a544ad5..bd5afa3ae 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf
index 5631ded64..45829ecb2 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf
index 34e878ee0..ee187a914 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf
index 1764f9329..2714d1692 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049.ttf
index c9d65ccc1..6e05c2a9a 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,2049.ttf
index 9b2545792..cfb4a8136 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,20E3.ttf
index 7b36e6f10..4850bd547 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
index a1fcc8ca1..90988530e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,AE,2049.ttf
index 159644469..0f1c1d1ee 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.39.ttf
index f7075d2f9..a02d7dce3 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.AE.ttf
index 8a68548df..a986f7c22 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049.ttf
index 073edc932..5aaaa450e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,2049.ttf
index 3d9c7828f..a347e6b9b 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,20E3.ttf
index b8eadb047..26ed8eead 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,39,AE,2049,38,20E3.ttf
index a1fcc8ca1..90988530e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,AE,2049.ttf
index eabf61af9..ce1de5f22 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf
index 936bb3c0a..1c54502aa 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf
index 77f4be203..2baaeddd2 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049.ttf
index 79e2d5dc8..54a60a5f0 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,2049.ttf
index 81832019a..197f9fdb8 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,20E3.ttf
index b465c5e58..2dfe823bc 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,39,AE,2049,38,20E3.ttf
index 4b7649d03..1c3602c20 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,AE,2049.ttf
index 3074fb34b..4ee7401f2 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf
index 18b002fd3..bec4feacc 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf
index c62767604..463305e2e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049.ttf
index 129e7f968..244b7db8a 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,2049.ttf
index ac583809d..95b06d202 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,20E3.ttf
index 128da7ce6..479ee22b6 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
index b2f7f731b..c18d25868 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,AE,2049.ttf
index a79bd9108..b53de1440 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.39.ttf
index e663b7bc4..e66e56f6b 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.AE.ttf
index c5682520b..9986e8bf7 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049.ttf
index fe772c987..d5e810b1c 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,2049.ttf
index 45b4dedbd..b7c0dfb88 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,20E3.ttf
index 1306b06f6..c18ce3fbe 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,39,AE,2049,38,20E3.ttf
index b2f7f731b..c18d25868 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,AE,2049.ttf
index abd10a626..87de5326f 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.39.ttf
index 36e40960a..5d104a5f5 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.AE.ttf
index 8659f8b62..f3f113cc4 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049.ttf
index 2cee9505c..46b86ad67 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,2049.ttf
index 70c9f1b3a..0a442462f 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,20E3.ttf
index de9ec81db..b0d4c3c3c 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,39,AE,2049,38,20E3.ttf
index 4b7649d03..1c3602c20 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,AE,2049.ttf
index 17a891160..616c8b69c 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.39.ttf
index c63734d24..31499c3ed 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.AE.ttf
index 981fdac6b..678c7f7de 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf
index 6b82a2903..90219b5d4 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf
index 9dd4d2efb..c732573ee 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf
index a8034f7a8..ee19558f9 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf
index c800f406f..a64ebb851 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf
index 3792ec5f9..e7f361a59 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf
index 9570f7a76..b545fef66 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf
index 54a914bc8..a3e570101 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf
index b2241cdcf..afcaaf434 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf
index 8068d6e4b..c25886224 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf
index 2386fec10..2e9e452dc 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
index 5b13eaf1b..b71cf1e58 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf
index b56305601..29a68bac4 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf
index 7e55cf5f7..4dce2bbb0 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf
index 246e09970..5a46b9c65 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf
index 57414b33f..d6ec08a12 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf
index 4dd5622a9..3895c0bfe 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf
index 69d9ade24..240b52b9c 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf
index 5b13eaf1b..b71cf1e58 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf
index a7834d353..6110a33f1 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf
index 362463c07..b5531106e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf
index e19a549ae..560c5fd80 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf
index f44eb7209..875e2aa48 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf
index 96ea0acee..f580b1f6f 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf
index 3e749ea0e..40e20ae0e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf
index c800f406f..a64ebb851 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf
index ea9f7977d..575652e4c 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf
index c463b6488..e4ae45a0f 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf
index d9d73af26..2d08de8b5 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049.ttf
index 91135db14..a935ea891 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,2049.ttf
index 327b5a9d7..0d4cb081e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,20E3.ttf
index 90509e0a4..5ce78a42b 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,39,AE,2049,38,20E3.ttf
index dc414bc03..43caba647 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,AE,2049.ttf
index e560bcb37..8d2fb18aa 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.39.ttf
index 5e6fe091d..1a95cbd37 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.AE.ttf
index 2395fbca6..61529eda9 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049.ttf
index 1579c3c5b..3a8418312 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,2049.ttf
index 6601691a6..17069cbf3 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,20E3.ttf
index 9777dba31..500055c79 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
index 4f684e177..ad5ca6ecb 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,AE,2049.ttf
index 7d5f7c44b..e217dbbc2 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.39.ttf
index c6751236a..6dd0566e4 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.AE.ttf
index 40ab37f27..951335026 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049.ttf
index 3314adafd..c3df9ee51 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,2049.ttf
index 11481e07b..fe0abeb21 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,20E3.ttf
index 66a5ce93e..c68bdd245 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,39,AE,2049,38,20E3.ttf
index 4f684e177..ad5ca6ecb 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,AE,2049.ttf
index aff5f6c3e..229a470b7 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.39.ttf
index 359c37fc7..3de462ae8 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.AE.ttf
index f456bdb30..712053e30 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049.ttf
index 9bbbfc1ea..087ba08a8 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,2049.ttf
index 129b0c7a3..3c560cc35 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,20E3.ttf
index 6bcdf40f8..e6b1e26c3 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,39,AE,2049,38,20E3.ttf
index dc414bc03..43caba647 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,AE,2049.ttf
index c55b0a7ad..661489e0e 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.39.ttf
index 6d5fa0e9b..b69f95390 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.AE.ttf
index 82e9d841a..1c274ce6b 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049.ttf
index 968ed75e0..b9daeecd9 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,2049.ttf
index 2f14cad64..62e7c4f6d 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,20E3.ttf
index 8e211fd16..43a5a3ad4 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,39,AE,2049,38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,39,AE,2049,38,20E3.ttf
index 14a544ad5..bd5afa3ae 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,39,AE,2049,38,20E3.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,39,AE,2049,38,20E3.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,AE,2049.ttf
index 06fbe73a4..1e6b60e6b 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,AE,2049.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,AE,2049.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf
index dc003fe99..4f61759d7 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf differ
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf
index c990eca7f..697e68b0a 100644
Binary files a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf and b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf
index b54850811..151facbea 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf
index 490061dbd..c3e8be275 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf
index 3043a3d6e..01eda174d 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.default.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf
index 07bef3970..09bad7af8 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf
index 1a8e60767..82f254bb6 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf
index 8f12c8d5a..1ce652fe3 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf
index 42d42a1f2..60c25cd17 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf
index 7e4f67a58..8ae2b7a1a 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf
index 52137b27b..328423121 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.desubroutinize.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf
index 7d0665cad..ddf5bec8f 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf
index 6f7d42c45..a3eedd646 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf
index e09189309..0c87d1938 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize-retain-gids.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf
index 6da46639e..987cb50e2 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf
index e4e7b468a..c5cda7ab2 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf
index 4ce677ef3..da5abf400 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-desubroutinize.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf
index a356293ef..49f3dd0a8 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf
index 5b2473126..70b0e8853 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf
index ce53b928f..71989f775 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints-retain-gids.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf
index 54fb44084..1ec2e4a85 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf
index 7a7aa0400..8a5bf13a6 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf
index e4ace2de2..e5ffbbfe8 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.drop-hints.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf
index 54ac3961a..9e041fab0 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.1FC,21,41,20,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf
index 42b501f7b..6c1dd9458 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.61,62,63.otf differ
diff --git a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf
index 4fc733a0f..91667a4ab 100644
Binary files a/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf and b/test/subset/data/expected/cff-full-font/SourceSansPro-Regular.retain-gids.D7,D8,D9,DA,DE.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf
index 571a0f10a..d663fa140 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf
index 2556452f4..e44dcc3e2 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf
index 47344b859..a80cb0f09 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf
index 24b830257..2df3d1783 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf
index 37c9aa3c2..0924a5963 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.default.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf
index e899c9d9b..c833d640b 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf
index 1c5006844..75a59c078 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf
index 19691e321..07068fc54 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf
index ecc6e8685..814374caa 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf
index 3c9ef2d0c..320359466 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize-retain-gids.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf
index d70016f34..f7a94c805 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf
index cc89e9fd6..56cab7325 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf
index f7031f91a..9c4db1d0e 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf
index eecc3a8e8..ba044c2d4 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf
index 49665316c..ee47ef562 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.desubroutinize.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf
index 48e7f87d9..93a08afd7 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf
index cc1d0b95f..db5737df6 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf
index 5b4340c15..ce4961622 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf
index d2228cb94..f7045177c 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf
index d56cbb5e7..608687544 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize-retain-gids.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf
index 1889e5946..14bf663e7 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf
index defc18ec5..7a8d0661c 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf
index a57076771..2d891f48e 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf
index 55dc279ad..ef649bf66 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf
index c6e6b0925..b85fb233b 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-desubroutinize.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf
index 095b62f51..84fdc5433 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf
index e02b0e406..75cfc2d17 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf
index 683df5f3b..69a81c36d 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf
index 10e1a8d9c..dda6119a3 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf
index e3cec520d..68dddb63e 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints-retain-gids.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf
index 252f8c424..f1e35df2b 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf
index 78be9b0a8..28b1aab91 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf
index 0825d1bc1..8414d1a3a 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf
index 05484a3ca..2c72a587e 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf
index 5edf7d238..46c69ce1d 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.drop-hints.660E.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf
index 52aa46b78..a50f30ba8 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,3048,304A,304B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf
index 2c4cd8165..fa5dd13b7 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.3042,3044,3046,73E0,5EA6,8F38.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf
index 8495146e8..c43bc94c2 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.61,63,65,6B.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf
index 804df21a9..c3718a90c 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E,6975,73E0,5EA6,8F38,6E05.otf differ
diff --git a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf
index e42e2c495..b3a5caee3 100644
Binary files a/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf and b/test/subset/data/expected/cff-japanese/SourceHanSans-Regular_subset.retain-gids.660E.otf differ
diff --git a/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1092.otf b/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1092.otf
index 4e520d961..61719a65b 100644
Binary files a/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1092.otf and b/test/subset/data/expected/cff.notoserifmyanmar/NotoSerifMyanmar-Regular.notdef-outline.1092.otf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf
index e76c43e32..0fcc5e48a 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,62.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,FEFA.ttf
index 5fcb45512..52a805286 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.61,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEE6,FECF.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEE6,FECF.ttf
index 8d830b48b..f77fdc9a9 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEE6,FECF.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEE6,FECF.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEF9,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEF9,FEFA.ttf
index e813464fb..a7c32d187 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEF9,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEF9,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEFA.ttf
index 61f0787db..01a14f65e 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.default.FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf
index 245d1d9e8..05258220a 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,62.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,FEFA.ttf
index 2eacfaf87..0022cbd9d 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.61,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEE6,FECF.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEE6,FECF.ttf
index 6322391fc..327e8da25 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEE6,FECF.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEE6,FECF.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEF9,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEF9,FEFA.ttf
index c0aaa733a..828865a7e 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEF9,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEF9,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEFA.ttf
index de2c13137..5609cc508 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints-retain-gids.FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf
index a94bb6528..6b65c18f8 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,62.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,FEFA.ttf
index bb94eefb9..c4046c3b2 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.61,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEE6,FECF.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEE6,FECF.ttf
index b32ebc936..4d0a72352 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEE6,FECF.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEE6,FECF.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEF9,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEF9,FEFA.ttf
index 90941737d..d9b1de1f6 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEF9,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEF9,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEFA.ttf
index f27f45bef..dca99d581 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.drop-hints.FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf
index 2ecc41997..62061569b 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,62.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,FEFA.ttf
index c47ea438c..58d18848f 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.61,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEE6,FECF.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEE6,FECF.ttf
index a213502f9..e85793f0d 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEE6,FECF.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEE6,FECF.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEF9,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEF9,FEFA.ttf
index f81ede0b5..8d17c6296 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEF9,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEF9,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEFA.ttf
index 5a13cc817..c57330754 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.name-ids.FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf
index fa00d04f2..dab579330 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,62.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,FEFA.ttf
index dae9e3b82..29613d8c7 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.61,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEE6,FECF.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEE6,FECF.ttf
index 017bd9f3b..e1cde2e81 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEE6,FECF.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEE6,FECF.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEF9,FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEF9,FEFA.ttf
index d658f0670..e0461c40e 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEF9,FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEF9,FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEFA.ttf b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEFA.ttf
index cea59d5ad..ffe2abafa 100644
Binary files a/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEFA.ttf and b/test/subset/data/expected/cmap/AdobeBlank-Regular.retain-gids.FEFA.ttf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf
index fb41408b3..8992c0586 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf
index e50256d08..6788349dd 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf
index 24f38717e..076e65e8e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf
index 38672bad6..ac87b0fc0 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf
index c5f898ea4..914583219 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf
index 03cae0746..d52bd9eee 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf
index 2506a41d3..38a0e9980 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf
index e8ebeb484..c62c36b5a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf
index 910cc0fef..e43b50925 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf
index d7d69727e..52479d0e5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf
index a1c001ce3..97bac6e0a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf
index 5b418025a..a9048c9ee 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf
index b88e288e8..b6249b20d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf
index 6d95272a7..77846efbe 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf
index 251568f3e..e3494bca5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf
index 2b1d7a7b7..d3fafedb1 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf
index dce7f14be..933d4a02d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf
index e1e22453a..d5c4004ef 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf
index f72cdc908..71812630a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf
index 4efa2e2c6..1d32789e8 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf
index a440b96c2..7c949c85d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf
index c503e386a..12c78e358 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf
index d36d15543..682012016 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf
index 34a846930..53fd33ff5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf
index d695329ef..bfe0fde59 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf
index 1c4d2b5ed..9728801cd 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf
index e5981f03c..4e2e346f2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf
index 4b76f1c4d..9cc7121e8 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf
index cf602159a..66b3cbb54 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf
index bf353ed14..7a04636a0 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.drop-hints.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf
index aecfd1c04..e5c959c68 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf
index 3249149bc..9797cbca2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf
index 1c17acfa4..41b0ff28b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf
index 4a6622655..e83f86945 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf
index 806f68901..fbd79eb99 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf
index 55f28d4d6..6975641b4 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf
index d17a22af1..2ce634861 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf
index cc4305dbf..4a3f2791a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf
index f2093c9e3..41ee3053f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf
index 09c8f8df6..b14adff0f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf
index a7b67bfb3..0fff0404f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf
index 7c6805d88..7986e7b5e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf
index b1876b6c6..1e6655e69 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf
index b07778f23..c04a65fb3 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf
index fb776323c..53f67082f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf
index 4ec322c57..360aa2526 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf
index ec2075586..6b02fd2cc 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf
index bf2c08650..4fa580558 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf
index 0a3721e1e..7a4387543 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf
index eaaa56db4..206ccd8c4 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.name-ids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf
index 5c5ce5c08..20f3204b9 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf
index 3b87f5489..b77645ab6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf
index e06a24df0..b5841cd11 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf
index aabdc5e80..81dbab9ae 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf
index 4183c9f12..2563bfd6b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf
index 66ef901fe..8a1b3c84a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf
index 4bee46fd7..4ab7d202f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf
index 6e8baa95a..655a42ac7 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf
index f6191dad1..8a58ba2aa 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf
index bf2746bdd..292a684e0 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf
index 460e81bcf..275e15968 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf
index f6df4cf38..f8ced4df5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf
index 5d15cd7a6..9e6392a12 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf
index 71bc4d6fa..9d54d2158 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf
index f28bd1d68..123a831da 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf
index d4401c73c..fc20c2213 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf
index 65c74c4ae..59113cb31 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf
index 97942772c..fd24e7b93 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf
index dea9124d1..6c26ebbe3 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf
index 12365f452..88903f758 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf
index f7679f5fe..68ff0a1e6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf
index 327f83f59..a04a86584 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf
index a3289fd5f..92eb8502e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf
index d0ba8604f..4f985c12c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf
index 9707490cc..397eaa75b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf
index f5de51927..d834f12c2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf
index 9203411cc..12df6f052 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf
index d7b13afc5..b666184ff 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf
index ae141a6d2..89499d091 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf
index 646ed6f64..d4cc006de 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints-retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf
index 04934520e..08f915b48 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf
index 2322e5d2f..e5494eb34 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf
index 6b9edac0f..fe83cd154 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf
index 9f243b8eb..f6de82ac2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf
index 8954cd74e..be0863e08 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf
index e62392863..38e1a881f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf
index 51237ad2f..765ccf984 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf
index e219c39cc..615497d9d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf
index 9fc0bda2d..99afe6c71 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf
index 02232eaee..f055b375e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.drop-hints.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf
index f90228790..fc90633c1 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf
index 426f7692c..dba2ed4f3 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf
index 0c2674a0b..8cf6f480a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf
index a59de5dff..26f3f835e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf
index 6a5a3a774..bdea74f89 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf
index df159d012..5a196ce32 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf
index 9b9f2b4d5..7d958935e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf
index bbac4f5c1..1354b513d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf
index 38b3fa8b2..05ec4e52c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf
index 3996080d9..9b5a2112f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf
index 021c9805b..6b98f715b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf
index cf3a5b3f4..085ac9132 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf
index 7c537c13a..a876532db 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf
index f24488b37..20a2be9e6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf
index 8d9e65a38..7a18ac3ec 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf
index f2f5ba03a..fedc00a62 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf
index aef4bd390..1f13d9f94 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf
index f24ad1fd5..bbbe714a8 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf
index 00c466f26..ed3bf3ee5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf
index 86fe67b15..9272b936e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.name-ids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf
index 0bc930a9d..fb33f77e6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf
index 9746b4559..2af72ea21 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf
index 2d378d85a..cabb33703 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf
index 42ada2ee9..47ac8cb74 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf
index 7e4cf58f0..b7b33c7bc 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E02.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf
index 846fee5c5..b2d2bf04e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf
index 018805cd0..014bd4fb5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf
index 1945b0b28..a88b7f8c0 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf
index f45fda15b..fbb2b4a6a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf
index ac622b63c..7f3562c2b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/cmap14/cmap14_font2.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf
index 42c2a8a0a..7d09649f1 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf
index 8c3191a97..a909415c0 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf
index 743ca0c25..2f1a11a1d 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf
index f21fab0ac..d77db7873 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.32.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf
index c2081b366..c48998601 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf
index 5ea202606..50281106c 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf
index 8acea94b9..ad6511e05 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.default.3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf
index d0d518768..353218b60 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf
index 91207c0bf..138251f71 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf
index 41f381b6e..5a5a3d4c7 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf
index 0273eadab..19c12c3e3 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.32.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf
index ccc2504b3..14616ce5f 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf
index 0af003a18..58b3df96d 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf
index 1900ddfca..64aa0d7f6 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints-retain-gids.3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf
index d0d518768..353218b60 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf
index 175b42d2f..918d8270d 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf
index 1593f16e8..aa67ab508 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf
index 0273eadab..19c12c3e3 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.32.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf
index 10dde8983..2bac4ba2d 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf
index fb7dc77f4..b2e34de13 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf
index 0725ade33..a55b0aab6 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.drop-hints.3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf
index 42c2a8a0a..7d09649f1 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf
index 32628c47f..c32947562 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf
index 25ba6b3c8..c28ad2fc7 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf
index f21fab0ac..d77db7873 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.32.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf
index 80df9b2d5..90d13221e 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297,3299.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf
index 97faf4be4..7077ac40f 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3297.ttf differ
diff --git a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf
index ff8cabb53..d7e90b4f1 100644
Binary files a/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf and b/test/subset/data/expected/colr/TwemojiMozilla.subset.retain-gids.3299.ttf differ
diff --git a/test/subset/data/expected/colr_with_components/colr-table.default.6B.ttf b/test/subset/data/expected/colr_with_components/colr-table.default.6B.ttf
index 28f005762..05bd96694 100644
Binary files a/test/subset/data/expected/colr_with_components/colr-table.default.6B.ttf and b/test/subset/data/expected/colr_with_components/colr-table.default.6B.ttf differ
diff --git a/test/subset/data/expected/colr_with_components/colr-table.drop-hints-retain-gids.6B.ttf b/test/subset/data/expected/colr_with_components/colr-table.drop-hints-retain-gids.6B.ttf
index 5ab44e92b..2ac4d2eae 100644
Binary files a/test/subset/data/expected/colr_with_components/colr-table.drop-hints-retain-gids.6B.ttf and b/test/subset/data/expected/colr_with_components/colr-table.drop-hints-retain-gids.6B.ttf differ
diff --git a/test/subset/data/expected/colr_with_components/colr-table.drop-hints.6B.ttf b/test/subset/data/expected/colr_with_components/colr-table.drop-hints.6B.ttf
index 28f005762..05bd96694 100644
Binary files a/test/subset/data/expected/colr_with_components/colr-table.drop-hints.6B.ttf and b/test/subset/data/expected/colr_with_components/colr-table.drop-hints.6B.ttf differ
diff --git a/test/subset/data/expected/colr_with_components/colr-table.retain-gids.6B.ttf b/test/subset/data/expected/colr_with_components/colr-table.retain-gids.6B.ttf
index 5ab44e92b..2ac4d2eae 100644
Binary files a/test/subset/data/expected/colr_with_components/colr-table.retain-gids.6B.ttf and b/test/subset/data/expected/colr_with_components/colr-table.retain-gids.6B.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf
index f651a21cc..f2773a6ef 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.1FC,21,41,20,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf
index b18a5e22b..e09202471 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.61,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf
index e428413c1..74bc0f28b 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.default.D7,D8,D9,DA,DE.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf
index ef22c51e2..ed6667318 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.1FC,21,41,20,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf
index 6e2b901e3..fb2d0a419 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.61,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf
index 768b2e59c..a99f248f1 100644
Binary files a/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/Roboto-Regular.drop-hints.D7,D8,D9,DA,DE.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf
index d02cb2c52..f19c7f97e 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.1FC,21,41,20,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf
index 19f717070..0872ad89a 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.61,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf
index 4c05b578c..66ac44649 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.default.D7,D8,D9,DA,DE.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf
index 3985c04a0..473125ae3 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.1FC,21,41,20,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf
index 19f717070..0872ad89a 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.61,62,63.ttf differ
diff --git a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf
index 4c05b578c..66ac44649 100644
Binary files a/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf and b/test/subset/data/expected/full-font/SourceSerifVariable-Roman.drop-hints.D7,D8,D9,DA,DE.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf
index f4b0f011e..362adc9db 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.1D715,1D7D8,41,42.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf
index 0e0f8be07..010b175ad 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.25771.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf
index 32097ab5d..6dba53a09 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,3048,304A,304B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf
index c08c3e579..1ca0702cd 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.3042,3044,3046,73E0,5EA6,8F38.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf
index cfe6cff8f..1591ed059 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.61,63,65,6B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf
index 28ecfc8cc..7a8b916df 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E,6975,73E0,5EA6,8F38,6E05.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf
index 770b034c4..fec3d6fb3 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.default.660E.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf
index 6da7d3094..f9dba581d 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.1D715,1D7D8,41,42.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf
index 6d8aa5d80..dcb16b2c2 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.25771.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf
index 8edadb54d..b55dd9077 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,3048,304A,304B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf
index 78b7199ef..4c9ce65ab 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.3042,3044,3046,73E0,5EA6,8F38.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf
index 76a5151f3..ed75c7e73 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.61,63,65,6B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf
index b4abab925..87e178550 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E,6975,73E0,5EA6,8F38,6E05.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf
index 4f7b482fa..b00a52311 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.drop-hints.660E.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf
index f4b0f011e..362adc9db 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.1D715,1D7D8,41,42.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf
index 0e0f8be07..010b175ad 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.25771.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf
index 32097ab5d..6dba53a09 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,3048,304A,304B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf
index c08c3e579..1ca0702cd 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.3042,3044,3046,73E0,5EA6,8F38.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf
index cfe6cff8f..1591ed059 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.61,63,65,6B.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf
index 28ecfc8cc..7a8b916df 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E,6975,73E0,5EA6,8F38,6E05.ttf differ
diff --git a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf
index 770b034c4..fec3d6fb3 100644
Binary files a/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf and b/test/subset/data/expected/japanese/Mplus1p-Regular.keep-gdef.660E.ttf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf
index 1381f88b3..07c369f19 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf
index 761a65e17..aaa5f8d25 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf
index a2715ef0d..3efeddbf4 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf
index c94a78f60..a2015f484 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf
index b8f6ea784..cea93383a 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf
index 21bc23428..aefea2d85 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf
index 67b0d9917..de726bba2 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf
index 47fe5d080..8cb8d7fa7 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf
index 48e05245f..9aa438a89 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index b8f6ea784..cea93383a 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf
index b71f54cb0..112bfaf1e 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf
index d0ce4a3e5..b842bf660 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf
index 5c14c1b8d..07918f0ff 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf
index 2152ca7fd..cca7a3a37 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf
index 4a992b83d..9b69f2fea 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf
index 8cc2769cc..4b9d2c3c9 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf
index 1a8d71a07..99cad62ac 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf
index 52fcc8c62..fc5c462d8 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf
index ae6325f7d..9b7aa2397 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index 4a992b83d..9b69f2fea 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf
index d6166c0cf..3e789a239 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf
index 2ee02fe34..f8230092d 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf
index 6e881ee47..affaf31b2 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf
index a4c8c42cd..fcd244267 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf
index 77c23585c..8ff6c80e3 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf
index 1422fa0eb..94928e2b4 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf
index ca3494fe6..44a67f99e 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf
index 58c9bf42e..cc5e4d655 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf
index 84bae1acf..a9e37c5d0 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf
index 77c23585c..8ff6c80e3 100644
Binary files a/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.context/gpos_context3_simple_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf
index 8f6be2cb3..301f68bf0 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A01.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf
index a1235a636..c83402eb5 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A05,A06.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf
index a17e0774c..2d5c08882 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.A07,A1B.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf
index 4d0c92b08..f205166c4 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.default.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf
index ae371f501..6316b260d 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A01.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf
index 0ed7fa426..90964bb85 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A05,A06.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf
index c2a73cdff..cae81c041 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.A07,A1B.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf
index 6db300d90..1c6369ac3 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.drop-hints.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf
index 8f6be2cb3..301f68bf0 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A01.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf
index a1235a636..c83402eb5 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A05,A06.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf
index a17e0774c..2d5c08882 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.A07,A1B.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf
index 4d0c92b08..f205166c4 100644
Binary files a/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf and b/test/subset/data/expected/layout.gdef-attachlist/IndicTestJalandhar-Regular.keep-gdef.retain-all-codepoint.ttf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf
index 81de55dd7..14c975bbe 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf
index d5f0aa4de..b6b4ee5e8 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf
index 5ac74e168..8ca15692c 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf
index c828f556c..0092ebfec 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41,56,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf
index 1ec8c556e..d34bfee12 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf
index 5df452453..0077291ad 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.default.42,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf
index 53a5e58a1..e58e56200 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf
index 035fbbebd..7c7d3895c 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf
index c4430ed1e..2b5a537a5 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf
index c3cb256d3..a0803dba6 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41,56,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf
index 055405298..b0c040eaf 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.41.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf
index 01311b2aa..fd6779c3a 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.drop-hints.42,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf
index 81de55dd7..14c975bbe 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf
index d5f0aa4de..b6b4ee5e8 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf
index 5ac74e168..8ca15692c 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf
index c828f556c..0092ebfec 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41,56,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf
index 1ec8c556e..d34bfee12 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.41.otf differ
diff --git a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf
index 5df452453..0077291ad 100644
Binary files a/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf and b/test/subset/data/expected/layout.gdef-varstore/AdobeVFPrototype.keep-gdef-gpos.42,57.otf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf
index 35be42664..137ae2002 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.1E00,303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf
index 2e50c30ef..9e47f4302 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf
index 2c452fe5f..7938c3e0b 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.309,20,30F.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf
index cd62653ef..b30d68e7c 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.323.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf
index 7495283df..c63169a6c 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.default.41,42,43.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf
index 9a1b87260..422fda9a1 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.1E00,303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf
index 85599f7d3..aee5b21da 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf
index 1f0c5e0ba..14f345bb0 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.309,20,30F.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf
index 7fa3f2bd5..67f68938e 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.323.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf
index ca94daa70..6ca653a10 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.drop-hints.41,42,43.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf
index 35be42664..137ae2002 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.1E00,303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf
index 2e50c30ef..9e47f4302 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.303.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf
index 2c452fe5f..7938c3e0b 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.309,20,30F.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf
index cd62653ef..b30d68e7c 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.323.ttf differ
diff --git a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf
index 7495283df..c63169a6c 100644
Binary files a/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf and b/test/subset/data/expected/layout.gdef/Roboto-Regular.keep-gdef-gpos.41,42,43.ttf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf
index a8dfffd13..7cca91a28 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf
index 791a9a894..83fa931d4 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf
index 83c0771a7..747420518 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf
index 09e38d5ff..22d78d816 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf
index e0cf95277..45154135d 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.43,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf
index 87be9ac1c..5ab69ffc3 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf
index c40db8e52..2d70e40ee 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf
index bf19981e9..3d851963d 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf
index 84cdca6dd..479133ba7 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf
index eb8f88ca2..142145479 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf
index 7d9bed22e..03f29a91d 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.43,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf
index 87be9ac1c..5ab69ffc3 100644
Binary files a/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos/gpos1_2_font.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf
index 42b13defb..3466f9e3c 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf
index 54aa03b23..edd10bf37 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf
index 7ffd4689a..3145da00f 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.2E,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf
index 852808e45..bbce3c32d 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf
index 4354aa7e9..021fd2071 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf
index 10dff4cc3..d13a1f9bc 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf
index ccc86c816..9859f61d4 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf
index 849a7c5b1..84ae8113f 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.2E,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf
index 597223417..5f79056d8 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf
index 4354aa7e9..021fd2071 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_1_font7.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf
index 4904307e8..36c09fea4 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf
index b3306fc2a..98de06f88 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf
index a80ccfcbc..8bf70b7c4 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.2E,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf
index 3766e7f65..e4ce9a865 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf
index 1098f7c49..4f5bb492d 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf
index 03c56c4f9..e50dd2e25 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23,25.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf
index 2c86996d2..4febba43a 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.21,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf
index 786de3028..abb24a405 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.2E,23.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf
index 1fb3d12e8..589fc9d3a 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf
index 1098f7c49..4f5bb492d 100644
Binary files a/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos2/gpos2_2_font5.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf
index 184d5cb6b..ce5077ab6 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,29.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf
index 1f5e98323..2c49c552f 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.28,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf
index adf2d0adc..aba9f431c 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.29,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf
index aea6a560a..85da4e839 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf
index 3bc9b8783..07a2c0202 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf
index bd02afe59..86efd189b 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,29.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf
index 856081670..82233401f 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.28,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf
index dea73b70e..752ef8889 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.29,2B.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf
index 5c6dcee12..35ddbeaa6 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf
index 3bc9b8783..07a2c0202 100644
Binary files a/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos3/gpos3_font3.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf
index dafff201a..86d04fa6d 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf
index 2fa69c9e2..2aeb49a96 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf
index 57218850e..3fee4ba98 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf
index 6cafcb831..6e08e2f83 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf
index 1021815f9..68e7adece 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf
index 07636380f..33f81927b 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf
index e1bbdf50f..704a18bdd 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf
index f4e2b3b8b..1ae460fd6 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf
index 657b68674..ab494c58d 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf
index bc25cb80e..471158800 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf
index 1f00f43a7..6989f923f 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf
index 0b3d17d95..8bbc09b84 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf
index cfd5f1e24..3e7a75a54 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf
index 8eb6ace19..1d2bd049d 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf
index 8a0e9746a..d14c3ac71 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf
index 798f56135..6d17cb1f3 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf
index 73b0155be..2cd9693c9 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf
index 65a323160..d9e4a43e7 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf
index f50cc90bc..c6b0867e9 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf
index bc25cb80e..471158800 100644
Binary files a/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos4/gpos4_multiple_anchors_1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf
index 9b3e75d74..bf6e9d9ea 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf
index 38d95cbae..4928a45cb 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf
index d17d9d87b..dd16e1d6f 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf
index 5607d82c0..0a0bfa9f5 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf
index 1297db218..29926a1a1 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf
index c016e2112..f2ae28f1d 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf
index 946c63c68..ab910d212 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf
index 093f4eef0..a55367476 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf
index 9e1aabf1c..89265a878 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf
index 65ee41ae4..3ccdb1175 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf
index db0e80ce3..7e90f5f29 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf
index f7512029c..978928cb0 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf
index 513f33125..a719416a5 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf
index 14f79e337..9a7a94ac6 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf
index 5b8c588a9..75af4bec3 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf
index eb2937afd..fa1ab9350 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf
index c28bed156..bbf99a6f7 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf
index 7878d4b8f..772503950 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf
index f5824e480..5b03ee6ef 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.42.otf differ
diff --git a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf
index 65ee41ae4..3ccdb1175 100644
Binary files a/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos5/gpos5_font1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf
index ae9cd4220..f0f6cb51f 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf
index 79487dc71..cbf669c77 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf
index 69a5df244..6b0b43a4d 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf
index 1b8a1cab1..da9998d28 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf
index 61258b572..e724a7c2d 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf
index e77361ad7..4bb966473 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf
index ebce48905..b2e632418 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf
index 82414b8e6..953369849 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf
index c151b9d8a..6785e68b3 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf
index e8e961eaf..4221ffd83 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf
index e3ea59fc5..e8120edf9 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf
index d076404f2..4dfae0c23 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf
index 7117c66ac..333f7894e 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf
index 426108161..fd8b8dff8 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf
index 82bd9c160..cbc942fd8 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf
index 5b925f2fa..050d42a44 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,44.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf
index 0257f0e93..c084e407f 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43,45.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf
index 5f9272cd3..da1e55d3a 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf
index c9ae1c71f..ad52c4636 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf
index e8e961eaf..4221ffd83 100644
Binary files a/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos6/gpos6_font1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf
index 456faaf0c..aa833dc79 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,623,62D,644,627,645,2E.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf
index cc9dd686a..49b29d566 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644,62D,628.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf
index 735052842..520f51425 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.627,644.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf
index 7e5575779..41c919af0 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.633,645,627,621,20,644,627.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf
index b903953fa..b131cafba 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.default.63A,64A,631.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf
index cc216a154..8a30af19a 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,623,62D,644,627,645,2E.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf
index 6e776451b..dab693fea 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644,62D,628.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf
index 0eb8552af..d00779b29 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.627,644.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf
index 99436b578..83c27dc9c 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.633,645,627,621,20,644,627.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf
index 1b27dad1e..a6e3ca048 100644
Binary files a/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf and b/test/subset/data/expected/layout.gpos8.amiri/Amiri-Regular.retain-gids.63A,64A,631.ttf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
index 7ec35bb08..6fdfef5a4 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf
index 206062b21..70ab671fd 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf
index 2447631d7..b2873ca5e 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
index 03f6ebd1a..e80620c01 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf
index 319094281..1cfcbf37d 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index 2447631d7..b2873ca5e 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf
index 58f08c330..a6b373e9c 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf
index b64fb14ce..51717d5b5 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf
index e9cdc4547..8a1ea2b20 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf
index bb21de823..4990e8c5e 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf
index 4a10c7683..96339dedb 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index e9cdc4547..8a1ea2b20 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf
index 6a92162d7..060a95149 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf
index 5f69d873a..f7e62975a 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf
index 754956680..323714911 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf
index d23e61354..2981800bf 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf
index 66b19412b..49967c294 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf
index 754956680..323714911 100644
Binary files a/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gpos8/gpos_chaining3_simple_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf
index cb5b909f2..005f5d68a 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf
index 4dd9df58c..e1f256baf 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf
index 13f172086..597824f21 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.default.42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf
index 3310714a9..7ca90da43 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf
index bfb62d7ae..924b7db82 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf
index 3ad1eb4f6..c655d44be 100644
Binary files a/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.otf and b/test/subset/data/expected/layout.gpos9/gpos9_font2.retain-gids.42.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.default.53A9,53F1.otf
index a00b0f998..4d3a745bc 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.default.53A9,53F1.otf 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
index 1a0c52d4d..27bc9bfaf 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53A9.otf 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
index ad984d814..0ae56f34c 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.default.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.default.retain-all-codepoint.otf
index 7013db94a..d2d74b2b5 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.default.retain-all-codepoint.otf 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.retain-gids.53A9,53F1.otf
index 3a8d104fb..ab270b2ce 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.retain-gids.53A9,53F1.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
index da6ca49dc..c73e4c474 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53A9.otf 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
index 9b2fdeeb3..99d39d53a 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.retain-gids.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.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.retain-gids.retain-all-codepoint.otf
index 1cbadaa7c..ecfe0865d 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.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf
index 181b8d8f1..3a1502531 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf
index 61a728f03..6d9cd2d98 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf
index 3b1ae2a63..d3e56bca7 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf
index 70e8ef7e8..34b906fb2 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf
index 41990d6b1..571a3daaf 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf
index d0bf4dea0..7a55e20aa 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf
index 74e62de07..a5ff8a5f4 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf
index 8cf90bf0b..6bada6807 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf
index ebc0f0087..c77f6f10a 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf
index 41990d6b1..571a3daaf 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context1_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf
index 7ff642f14..1a539d5e2 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf
index 6b91f4bf3..18bfef9b9 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf
index 59dd1dcc4..0ed150bbd 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf
index 32c57fae6..e27ebffca 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf
index 5f9883260..570a9265e 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf
index f67517077..2f7bca939 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf
index 6bcfd4d2b..ddbcb489b 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf
index 88f2ddb89..e3c8aac54 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf
index 01471cb56..57e53b07a 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf
index 5f9883260..570a9265e 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context2_multiple_subrules_f2.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf
index 7857a0e3e..bd6848425 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf
index 1824f31de..2593dd56c 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf
index b72ad4fe8..1137b142c 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf
index 9474c38e6..896e146fb 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf
index 060d8f242..1a5cc4e5e 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf
index 748fd4e69..284499daa 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf
index 8ac3085f9..e22bfdea8 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,42.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf
index 6a41f5629..586284dd0 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf
index 31d7ce7e0..072bd50a4 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf
index 060d8f242..1a5cc4e5e 100644
Binary files a/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub5/gsub_context3_successive_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf
index d324012be..fb145798c 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf
index e87cfff7d..afb2d7bf3 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf
index ebf56f0a9..fe7f23845 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf
index ef0e490e9..7a6b267b7 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf
index 30e98e022..378d90103 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index ebf56f0a9..fe7f23845 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining1_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf
index b94bf708d..83a2b636a 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf
index 80da7953a..9463f2924 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf
index e3dc20f9b..4052aabbb 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf
index a83989b0b..5c02f5814 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf
index 90634d6fb..cd7cc2fc2 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf
index e3dc20f9b..4052aabbb 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining2_multiple_subrules_f1.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf
index f2b8f7176..2cc882d56 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf
index 45bc0be51..03e0eabab 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf
index 07286e3f4..62f074d0d 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf
index 3b19106d8..dee436465 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.30,31,32,33.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf
index d87455d07..ab9b97efd 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf
index 07286e3f4..62f074d0d 100644
Binary files a/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub6/gsub_chaining3_simple_f2.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf
index b2ec2d9d7..a20d99d1a 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47,48,49.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf
index 80f2c6e42..5d37fd0cc 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,47.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf
index ac92afa32..31bb6aba5 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,4D.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf
index 302611954..3a5b024f4 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46,51.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf
index 97dd96d4e..95ceb664b 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf
index d4783b351..1acce9091 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf
index b442889e1..4b7d4aa2c 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf
index 190130276..2338c8044 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.61.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf
index ac065e511..2866ebf32 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.default.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf
index bf8e048a3..d001465b9 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47,48,49.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.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.retain-gids.41,42,43,44,45,46,47.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf
index 6af7f145f..61f157bdd 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,47.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf
index e390914b2..e7410015d 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,4D.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf
index de4ae1d06..2bd1eb0e0 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46,51.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf
index eea44642b..a1ffd1a03 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43,44,45,46.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf
index 89553364d..81e9fac53 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41,42,43.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf
index 1a29bbe47..26f64b78e 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.41.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf
index 2cbf8a604..cf54c4db6 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.61.otf differ
diff --git a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf
index ac065e511..2866ebf32 100644
Binary files a/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf and b/test/subset/data/expected/layout.gsub8/gsub8_manually_created.retain-gids.retain-all-codepoint.otf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.default.1780.ttf b/test/subset/data/expected/layout.khmer/Khmer.default.1780.ttf
index e3d9c8f87..cf6da162f 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.default.1780.ttf and b/test/subset/data/expected/layout.khmer/Khmer.default.1780.ttf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.default.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf b/test/subset/data/expected/layout.khmer/Khmer.default.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf
index 9c122b553..5cfc2df42 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.default.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf and b/test/subset/data/expected/layout.khmer/Khmer.default.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.default.31.ttf b/test/subset/data/expected/layout.khmer/Khmer.default.31.ttf
index fb54e5ba8..c8158379f 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.default.31.ttf and b/test/subset/data/expected/layout.khmer/Khmer.default.31.ttf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1780.ttf b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1780.ttf
index 6f5e78906..a469d82f3 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1780.ttf and b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1780.ttf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf
index 572c41feb..7b4abf9ce 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf and b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.1789,17BB,17C6,1794,17B6,1793,1798,17BE.ttf differ
diff --git a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.31.ttf b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.31.ttf
index 31a6c1a69..631d2d1e8 100644
Binary files a/test/subset/data/expected/layout.khmer/Khmer.retain-gids.31.ttf and b/test/subset/data/expected/layout.khmer/Khmer.retain-gids.31.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,623,62D,644,627,645,2E.ttf
index dd6c9992a..0e704b8eb 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,623,62D,644,627,645,2E.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,62D,628.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,62D,628.ttf
index 1592ac6d9..72a7218e1 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,62D,628.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644,62D,628.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644.ttf
index dc8b996f6..e45f5c11b 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.627,644.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.633,645,627,621,20,644,627.ttf
index e6eec3930..6d3c64e8a 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.633,645,627,621,20,644,627.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.63A,64A,631.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.63A,64A,631.ttf
index 6554f327c..3b9fc1e81 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.63A,64A,631.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.default.63A,64A,631.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,623,62D,644,627,645,2E.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,623,62D,644,627,645,2E.ttf
index 07858c77f..8611e5357 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,623,62D,644,627,645,2E.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,623,62D,644,627,645,2E.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D,628.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D,628.ttf
index 5a86fa71f..b51c5a649 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D,628.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644,62D,628.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644.ttf
index 3ccf6e1c4..46e24796e 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.627,644.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.633,645,627,621,20,644,627.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.633,645,627,621,20,644,627.ttf
index 5efb0b83a..54c01e9a3 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.633,645,627,621,20,644,627.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.633,645,627,621,20,644,627.ttf differ
diff --git a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.63A,64A,631.ttf b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.63A,64A,631.ttf
index 46936aa8c..121559b5b 100644
Binary files a/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.63A,64A,631.ttf and b/test/subset/data/expected/layout.notonastaliqurdu/NotoNastaliqUrdu-Bold.retain-gids.63A,64A,631.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf
index 7bcb2a229..3e60a5860 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,42,43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf
index ed1be23c6..02c5b87f4 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41,43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf
index a3400b124..437d9b46a 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.41.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf
index 7204e10e6..52c1bd1e2 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf
index ea36c4be4..0bbac8d35 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.default.CA,CB.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf
index 1d6652991..5f84010ad 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,42,43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf
index 874c7a78f..889112281 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41,43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf
index 412a33dde..b76cfea33 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.41.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf
index d5048b0df..af4fb3f27 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.43.ttf differ
diff --git a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf
index ea16a3e81..3b68ba5a9 100644
Binary files a/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf and b/test/subset/data/expected/layout/Roboto-Regular.smallcaps.retain-gids.CA,CB.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.default.58,59.ttf b/test/subset/data/expected/sbix/sbix.default.58,59.ttf
index d99bfc97a..4ad30aaa4 100644
Binary files a/test/subset/data/expected/sbix/sbix.default.58,59.ttf and b/test/subset/data/expected/sbix/sbix.default.58,59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.default.58.ttf b/test/subset/data/expected/sbix/sbix.default.58.ttf
index 6960f8f98..f19a06d73 100644
Binary files a/test/subset/data/expected/sbix/sbix.default.58.ttf and b/test/subset/data/expected/sbix/sbix.default.58.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.default.59.ttf b/test/subset/data/expected/sbix/sbix.default.59.ttf
index 1a4ac9725..4f821c1ff 100644
Binary files a/test/subset/data/expected/sbix/sbix.default.59.ttf and b/test/subset/data/expected/sbix/sbix.default.59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf
index 96f03e63d..2b43f9771 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58,59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf
index d88e416df..7c10f784b 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.58.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf
index 0de61a856..d3a820c31 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints-retain-gids.59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf
index 96f03e63d..2b43f9771 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.58,59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf
index d88e416df..7c10f784b 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.58.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf b/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf
index a3c09e99a..ba67fca8a 100644
Binary files a/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf and b/test/subset/data/expected/sbix/sbix.drop-hints.59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf
index d99bfc97a..4ad30aaa4 100644
Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.58,59.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf
index 6960f8f98..f19a06d73 100644
Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.58.ttf differ
diff --git a/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf b/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf
index 21d014bd1..c535d82c2 100644
Binary files a/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf and b/test/subset/data/expected/sbix/sbix.retain-gids.59.ttf differ
diff --git a/test/subset/data/expected/variable/Fraunces.default.26,66,69,124,125.ttf b/test/subset/data/expected/variable/Fraunces.default.26,66,69,124,125.ttf
index e5349bd94..54af66b99 100644
Binary files a/test/subset/data/expected/variable/Fraunces.default.26,66,69,124,125.ttf and b/test/subset/data/expected/variable/Fraunces.default.26,66,69,124,125.ttf differ
diff --git a/test/subset/data/expected/variable/Fraunces.default.61.ttf b/test/subset/data/expected/variable/Fraunces.default.61.ttf
index 83da22cf2..928783858 100644
Binary files a/test/subset/data/expected/variable/Fraunces.default.61.ttf and b/test/subset/data/expected/variable/Fraunces.default.61.ttf differ
diff --git a/test/subset/generate-expected-outputs.py b/test/subset/generate-expected-outputs.py
index b7bca309a..fabdfef4b 100755
--- a/test/subset/generate-expected-outputs.py
+++ b/test/subset/generate-expected-outputs.py
@@ -5,26 +5,71 @@
 
 import os
 import sys
+import shutil
+import io
+import re
+import tempfile
+
+from difflib import unified_diff
+from fontTools.ttLib import TTFont
 
 from subprocess import check_call
 from subset_test_suite import SubsetTestSuite
 
 
 def usage():
-	print("Usage: generate-expected-outputs.py <test suite file> ...")
+	print("Usage: generate-expected-outputs.py hb-subset <test suite file> ...")
 
 
-def generate_expected_output(input_file, unicodes, profile_flags, output_path):
+def strip_check_sum (ttx_string):
+	return re.sub ('checkSumAdjustment value=["]0x([0-9a-fA-F])+["]',
+		       'checkSumAdjustment value="0x00000000"',
+		       ttx_string, count=1)
+
+
+def generate_expected_output(input_file, unicodes, profile_flags, output_directory, font_name):
+	fonttools_path = os.path.join(output_directory, font_name)
 	args = ["fonttools", "subset", input_file]
 	args.extend(["--drop-tables+=DSIG",
 		     "--drop-tables-=sbix",
 		     "--unicodes=%s" % unicodes,
-		     "--output-file=%s" % output_path])
+		     "--output-file=%s" % fonttools_path])
 	args.extend(profile_flags)
 	check_call(args)
+	with io.StringIO () as fp:
+		with TTFont (fonttools_path) as font:
+			font.saveXML (fp)
+		fonttools_ttx = strip_check_sum (fp.getvalue ())
+
+	harfbuzz_path = os.path.join(tempfile.mkdtemp (), font_name)
+	args = [
+		hb_subset,
+		"--font-file=" + input_file,
+		"--output-file=" + harfbuzz_path,
+		"--unicodes=%s" % unicodes,
+		"--drop-tables+=DSIG",
+		"--drop-tables-=sbix"]
+	args.extend(profile_flags)
+	check_call(args)
+	with io.StringIO () as fp:
+		with TTFont (harfbuzz_path) as font:
+			font.saveXML (fp)
+		harfbuzz_ttx = strip_check_sum (fp.getvalue ())
+
+	if harfbuzz_ttx != fonttools_ttx:
+		for line in unified_diff (fonttools_ttx.splitlines (1), harfbuzz_ttx.splitlines (1)):
+			sys.stdout.write (line)
+		sys.stdout.flush ()
+		raise Exception ('ttx for fonttools and harfbuzz does not match.')
+
+	output_path = os.path.join(output_directory, font_name)
+	shutil.copy(harfbuzz_path, output_path)
 
 
 args = sys.argv[1:]
+if not args:
+	usage()
+hb_subset, args = args[0], args[1:]
 if not args:
 	usage()
 
@@ -39,5 +84,4 @@ for path in args:
 			font_name = test.get_font_name()
 			print("Creating subset %s/%s" % (output_directory, font_name))
 			generate_expected_output(test.font_path, unicodes, test.get_profile_flags(),
-						 os.path.join(output_directory,
-							      font_name))
+						 output_directory, font_name)
diff --git a/test/subset/run-tests.py b/test/subset/run-tests.py
index c7e04078c..1f31a0708 100755
--- a/test/subset/run-tests.py
+++ b/test/subset/run-tests.py
@@ -11,6 +11,7 @@ import sys
 import tempfile
 import shutil
 import io
+import hashlib
 
 from subset_test_suite import SubsetTestSuite
 
@@ -62,9 +63,18 @@ def run_test (test, should_check_ots):
 	if ret != "success":
 		return fail_test (test, cli_args, "%s failed" % ' '.join (cli_args))
 
+	expected_file = os.path.join (test_suite.get_output_directory (), test.get_font_name ())
+	with open (expected_file, "rb") as fp:
+		expected_hash = hashlib.sha224(fp.read()).hexdigest()
+	with open (out_file, "rb") as fp:
+		actual_hash = hashlib.sha224(fp.read()).hexdigest()
+
+	if expected_hash == actual_hash:
+		return 0
+
 	expected_ttx = io.StringIO ()
 	try:
-		with TTFont (os.path.join (test_suite.get_output_directory (), test.get_font_name ())) as font:
+		with TTFont (expected_file) as font:
 			font.saveXML (expected_ttx)
 	except Exception as e:
 		print (e)