diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index 0f1edce0b..7a7a77ad5 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -1397,6 +1397,9 @@ struct CmapSubtableFormat14
     hb_vector_t<hb_pair_t<unsigned, unsigned>> obj_indices;
     for (int i = src_tbl->record.len - 1; i >= 0; i--)
     {
+      if (!unicodes->has(src_tbl->record[i].varSelector))
+        continue;
+
       hb_pair_t<unsigned, unsigned> result = src_tbl->record[i].copy (c, unicodes, glyphs_requested, glyph_map, base);
       if (result.first || result.second)
 	obj_indices.push (result);
@@ -1453,6 +1456,7 @@ struct CmapSubtableFormat14
   {
     + hb_iter (record)
     | hb_filter (hb_bool, &VariationSelectorRecord::nonDefaultUVS)
+    | hb_filter (unicodes, &VariationSelectorRecord::varSelector)
     | hb_map (&VariationSelectorRecord::nonDefaultUVS)
     | hb_map (hb_add (this))
     | hb_apply ([=] (const NonDefaultUVS& _) { _.closure_glyphs (unicodes, glyphset); })
diff --git a/src/hb-ot-os2-table.hh b/src/hb-ot-os2-table.hh
index 6c9140226..c00d22b24 100644
--- a/src/hb-ot-os2-table.hh
+++ b/src/hb-ot-os2-table.hh
@@ -284,8 +284,8 @@ struct OS2
         os2_prime->usWidthClass = width_class;
     }
 
-    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->unicodes.get_min ());
-    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->unicodes.get_max ());
+    os2_prime->usFirstCharIndex = hb_min (0xFFFFu, c->plan->os2_info.min_cmap_codepoint);
+    os2_prime->usLastCharIndex  = hb_min (0xFFFFu, c->plan->os2_info.max_cmap_codepoint);
 
     if (c->plan->flags & HB_SUBSET_FLAGS_NO_PRUNE_UNICODE_RANGES)
       return_trace (true);
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 59020dbe8..c88fd75a5 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -678,7 +678,8 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
                               hb_subset_plan_t *plan)
 {
   OT::cmap::accelerator_t cmap (plan->source);
-  unsigned size_threshold = plan->source->get_num_glyphs ();
+  unsigned size_threshold = plan->source->get_num_glyphs ();  
+
   if (glyphs->is_empty () && unicodes->get_population () < size_threshold)
   {
 
@@ -797,6 +798,21 @@ _populate_unicodes_to_retain (const hb_set_t *unicodes,
     plan->unicodes.add_sorted_array (&arr.arrayZ->first, arr.length, sizeof (*arr.arrayZ));
     plan->_glyphset_gsub.add_array (&arr.arrayZ->second, arr.length, sizeof (*arr.arrayZ));
   }
+
+  // Variation selectors don't have glyphs associated with them in the cmap so they will have been filtered out above
+  // but should still be retained. Add them back here.
+
+  // However, the min and max codepoints for OS/2 should be calculated without considering variation selectors,
+  // so record those first.
+  plan->os2_info.min_cmap_codepoint = plan->unicodes.get_min();
+  plan->os2_info.max_cmap_codepoint = plan->unicodes.get_max();
+  
+  hb_set_t variation_selectors_to_retain;
+  cmap.collect_variation_selectors(&variation_selectors_to_retain);
+  + variation_selectors_to_retain.iter()
+  | hb_filter(unicodes)
+  | hb_sink(&plan->unicodes)
+  ;
 }
 
 static unsigned
diff --git a/src/hb-subset-plan.hh b/src/hb-subset-plan.hh
index 19a9fa691..fe80c08bc 100644
--- a/src/hb-subset-plan.hh
+++ b/src/hb-subset-plan.hh
@@ -41,6 +41,13 @@ namespace OT {
 struct Feature;
 }
 
+struct os2_info_t {
+  hb_codepoint_t min_cmap_codepoint;
+  hb_codepoint_t max_cmap_codepoint;
+};
+
+typedef struct os2_info_t os2_info_t;
+
 struct head_maxp_info_t
 {
   head_maxp_info_t ()
@@ -180,6 +187,8 @@ struct hb_subset_plan_t
   //recalculated head/maxp table info after instancing
   mutable head_maxp_info_t head_maxp_info;
 
+  os2_info_t os2_info;
+
   const hb_subset_accelerator_t* accelerator;
   hb_subset_accelerator_t* inprogress_accelerator;
 
diff --git a/test/api/test-subset-cmap.c b/test/api/test-subset-cmap.c
index e16400ea5..9aef6f8d4 100644
--- a/test/api/test-subset-cmap.c
+++ b/test/api/test-subset-cmap.c
@@ -145,6 +145,7 @@ test_subset_cmap_noto_color_emoji_noop (void)
   hb_set_add (codepoints, 0xAE);
   hb_set_add (codepoints, 0x2049);
   hb_set_add (codepoints, 0x20E3);
+  hb_set_add (codepoints, 0xfe0f);
   face_subset = hb_subset_test_create_subset (face, hb_subset_test_create_input (codepoints));
   hb_set_destroy (codepoints);
 
@@ -165,6 +166,7 @@ test_subset_cmap_noto_color_emoji_non_consecutive_glyphs (void)
   hb_set_add (codepoints, 0x38);
   hb_set_add (codepoints, 0xAE);
   hb_set_add (codepoints, 0x2049);
+  hb_set_add (codepoints, 0xfe0f);
   face_subset = hb_subset_test_create_subset (face, hb_subset_test_create_input (codepoints));
   hb_set_destroy (codepoints);
 
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,00AE,2049,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,2049,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0038,20E3,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.0039,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.00AE,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.default.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints-retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0038,20E3,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.0039,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.drop-hints.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0038,20E3,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.0039,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.default.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints-retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.drop-hints.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.gap.retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.default.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints-retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.drop-hints.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.index_format3.retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.default.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints-retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.drop-hints.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.0038,20E3,FE0F.ttf
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.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.0039,FE0F.ttf
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.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.multiple_size_tables.retain-gids.2049,FE0F.ttf
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.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,39,AE,2049,38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0038,0039,00AE,2049,0038,20E3,FE0F.ttf
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.0038,00AE,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,AE,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0038,00AE,2049,FE0F.ttf
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.0038,2049,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0038,2049,FE0F.ttf
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.0038,20E3,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.38,20E3.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0038,20E3,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0039,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.39.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.0039,FE0F.ttf
diff --git a/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf b/test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.00AE,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.AE.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.00AE,FE0F.ttf
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,FE0F.ttf
similarity index 100%
rename from test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049.ttf
rename to test/subset/data/expected/cbdt/NotoColorEmoji.subset.retain-gids.2049,FE0F.ttf
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..6f417f274
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf
index 6f417f274..ea3760076 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..4f3902b39
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf
index 4f3902b39..546e84c5d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..22d8b57f0
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf
index 22d8b57f0..343bfb529 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..e80e29023
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf
index e80e29023..17e0c4df4 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf
new file mode 100644
index 000000000..21efe7a1f
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf
new file mode 100644
index 000000000..6b68f7008
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf
index 6b68f7008..1b2836fe6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..2877b3c50
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf
index 2877b3c50..bf5999fe2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..69bcaaffb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf
index 69bcaaffb..ebb87e53e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf
new file mode 100644
index 000000000..a1c08be66
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf
index a1c08be66..ee603c920 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..041218728
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf
index 041218728..a47bfd0a3 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..03ad26dab
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf
index 03ad26dab..f05d066e7 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..1b995fee4
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf
index 1b995fee4..760884c80 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..543fec5f2
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf
index 543fec5f2..679dad271 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,E0100.otf
new file mode 100644
index 000000000..ff9f70cdb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03,E0100.otf
new file mode 100644
index 000000000..877c1915c
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf
index 877c1915c..b5ee80f3e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..8a91fe0eb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf
index 8a91fe0eb..f89d1d4ef 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..c125b7032
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf
index c125b7032..8b575b7d7 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,E0100.otf
new file mode 100644
index 000000000..0eb2f9e72
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf
index 0eb2f9e72..ec21a0aff 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-drop-hints.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..fbe79dfcf
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf
index fbe79dfcf..7800d1aa5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..2e0edaf9d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf
index 2e0edaf9d..ef28ff2ab 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..ec0fad37b
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf
index ec0fad37b..a53b19e34 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..3767814ce
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf
index 3767814ce..0842d509c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,E0100.otf
new file mode 100644
index 000000000..87059e214
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03,E0100.otf
new file mode 100644
index 000000000..a99addafb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf
index a99addafb..4bf741c40 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..d4b390860
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf
index d4b390860..2b973b88a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..a1f9def1a
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf
index a1f9def1a..ad15a18a7 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,E0100.otf
new file mode 100644
index 000000000..ca9512af1
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf
index ca9512af1..9f420180e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..07f7b2582
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf
index 07f7b2582..671c4ba3d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..c491db487
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf
index c491db487..703d60c90 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..3f35b1999
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf
index 3f35b1999..6d7ded1ec 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..a26347d49
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf
index a26347d49..5e6d5865a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,E0100.otf
new file mode 100644
index 000000000..d0d6613e3
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03,E0100.otf
new file mode 100644
index 000000000..fbf89373e
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf
index fbf89373e..3e50a7171 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..fc7f26b13
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf
index fc7f26b13..cdb017254 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..8b41561f9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf
index 8b41561f9..1be0ab786 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,E0100.otf
new file mode 100644
index 000000000..391218f34
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf
index 391218f34..0c044012e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-name-ids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..4a212017f
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf
index 4a212017f..5e513cc1b 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..bec789b5e
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf
index bec789b5e..bbab3254d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..cacbb74f0
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf
index cacbb74f0..0f521cf11 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..09a8c3fe7
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf
index 09a8c3fe7..ed8243af2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,E0100.otf
new file mode 100644
index 000000000..eaca75c91
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03,E0100.otf
new file mode 100644
index 000000000..f0a95ebb8
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf
index f0a95ebb8..1c9bcf70c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..2701ca193
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf
index 2701ca193..f9d7e1a68 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..18a48b64e
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf
index 18a48b64e..e56b81b97 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,E0100.otf
new file mode 100644
index 000000000..fcd8c4f65
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf
index fcd8c4f65..5956517c1 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..8bb85a642
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf
index 8bb85a642..7c9667a1c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..137f1651d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf
index 137f1651d..3edfd175c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..1b2dfdfb9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf
index 1b2dfdfb9..318a6968f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..4dee16901
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf
index 4dee16901..6d9999d08 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,E0100.otf
new file mode 100644
index 000000000..775a67c93
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03,E0100.otf
new file mode 100644
index 000000000..fcf87259a
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf
index fcf87259a..b4df95889 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..0248360e6
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf
index 0248360e6..30c9a1df4 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..649feae14
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf
index 649feae14..69bec2437 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,E0100.otf
new file mode 100644
index 000000000..8010c0f04
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf
index 8010c0f04..8552571b2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font1.notdef-outline.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..a1720189a
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf
index a1720189a..ccdc0cf47 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..59ba9b2da
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf
index 59ba9b2da..0faf9d721 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..ed110b9d9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf
index ed110b9d9..9f54caba9 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..996713e60
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf
index 996713e60..75e538c13 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf
new file mode 100644
index 000000000..dda36155d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf
new file mode 100644
index 000000000..8f0e542f3
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf
index 8f0e542f3..f5e32265d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..9247f615f
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf
index 9247f615f..5de4bc5c5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..91bdcdd05
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf
index 91bdcdd05..b9fd93fc5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf
new file mode 100644
index 000000000..6d4ea8f84
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf
index 6d4ea8f84..c78826108 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..a0a8321b2
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf
index a0a8321b2..e8847725f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..8897d7486
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf
index 8897d7486..2d5269a2a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..717f255f2
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf
index 717f255f2..d2b75bc1d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..c90f248c3
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf
index c90f248c3..d4f848ed5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,E0100.otf
new file mode 100644
index 000000000..f364d0eba
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03,E0100.otf
new file mode 100644
index 000000000..d2e491549
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf
index d2e491549..5c8fdcba5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..eaa29437f
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf
index eaa29437f..62de2b140 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..7bb0772c2
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf
index 7bb0772c2..c064f2eec 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,E0100.otf
new file mode 100644
index 000000000..c19070087
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf
index c19070087..4ce17301c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-drop-hints.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..d9d7645c3
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf
index d9d7645c3..9abbcc1ce 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..46195031c
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf
index 46195031c..d0d477434 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..eaab0aac9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf
index eaab0aac9..8d8430e8f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..1e00ded7a
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf
index 1e00ded7a..46db924cd 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,E0100.otf
new file mode 100644
index 000000000..986c80ecf
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03,E0100.otf
new file mode 100644
index 000000000..dd00dfb4b
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf
index dd00dfb4b..14c87cb5a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..1eac8ee70
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf
index 1eac8ee70..65d412653 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..e4ec6621d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf
index e4ec6621d..5422b936d 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,E0100.otf
new file mode 100644
index 000000000..a1ac1e98e
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf
index a1ac1e98e..5f92be899 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..21b6f7d3d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf
index 21b6f7d3d..7a59c5fb4 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..ed3e4eb2d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf
index ed3e4eb2d..ff5f02952 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..9d591eb87
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf
index 9d591eb87..0146a0003 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..19fdddbf7
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf
index 19fdddbf7..83b7d25b5 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,E0100.otf
new file mode 100644
index 000000000..ab18162ce
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03,E0100.otf
new file mode 100644
index 000000000..206579586
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf
index 206579586..b2df0657e 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..dc14f3875
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf
index dc14f3875..48d907b8a 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..bebffae65
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf
index bebffae65..1b3b01386 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,E0100.otf
new file mode 100644
index 000000000..317e87647
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf
index 317e87647..9b7da18b8 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-name-ids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..7b3046a75
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf
index 7b3046a75..2b1abd61c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..82efd78a7
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf
index 82efd78a7..8d126f8ef 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..fba35b019
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf
index fba35b019..e57c0cc45 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..6669184f2
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf
index 6669184f2..cc81a2c65 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,E0100.otf
new file mode 100644
index 000000000..b23afcecb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03,E0100.otf
new file mode 100644
index 000000000..6e2a5228d
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf
index 6e2a5228d..d9e56ef3f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..b9a1ed1f7
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf
index b9a1ed1f7..a8563fefd 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..d48a5e1e9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf
index d48a5e1e9..ef0fe90dd 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,E0100.otf
new file mode 100644
index 000000000..40c22d2cb
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf
index 40c22d2cb..b8061dafc 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline-retain-gids.4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03,E0100.otf
new file mode 100644
index 000000000..1ad2629ee
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf
index 1ad2629ee..3d7c8fa19 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E02,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03,E0100.otf
new file mode 100644
index 000000000..0925800e9
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf
index 0925800e9..56f6079d2 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07,E0100.otf
new file mode 100644
index 000000000..1ed837bb7
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf
index 1ed837bb7..0cc701f2c 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E00,4E05,4E07.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08,E0100.otf
new file mode 100644
index 000000000..778a2d66e
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf
index 778a2d66e..8ad67b020 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,4E03,4E08.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,E0100.otf
new file mode 100644
index 000000000..698901170
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E02,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03,E0100.otf
new file mode 100644
index 000000000..c6aeacd1b
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf
index c6aeacd1b..c8f9b74a0 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E03.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf
new file mode 100644
index 000000000..cd02fda86
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf
index cd02fda86..87892c6a6 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E05,4E07,4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09,E0100.otf
new file mode 100644
index 000000000..13148c83b
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf
index 13148c83b..b34218b7f 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,4E09.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,E0100.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,E0100.otf
new file mode 100644
index 000000000..546ce3418
Binary files /dev/null and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08,E0100.otf differ
diff --git a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf
index 546ce3418..5e123d430 100644
Binary files a/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf and b/test/subset/data/expected/cmap14/cmap14_font2.notdef-outline.4E08.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf
index 87ada2618..743a2f2f3 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9,53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf
index 42464f352..456c7e26a 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53A9.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf
index 009db72e8..f390a6cd0 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test-retain-gids.53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf
index 1a4f65f8d..59eccd61d 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9,53F1.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf
index c1cd42ccc..38e3d8ad8 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53A9.otf differ
diff --git a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf
index 688005a05..bd8c7115a 100644
Binary files a/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf and b/test/subset/data/expected/layout.gsub3/gsub_alternate_substitution.layout-test.53F1.otf differ
diff --git a/test/subset/data/tests/cbdt.tests b/test/subset/data/tests/cbdt.tests
index 5e74fef73..15e58779b 100644
--- a/test/subset/data/tests/cbdt.tests
+++ b/test/subset/data/tests/cbdt.tests
@@ -11,10 +11,10 @@ drop-hints-retain-gids.txt
 retain-gids.txt
 
 SUBSETS:
-89®⁉8⃣
-8®⁉
-8⁉
-®
-9
-⁉
-8⃣
+U+0038,U+0039,U+00AE,U+2049,U+0038,U+20E3,U+FE0F
+U+0038,U+00AE,U+2049,U+FE0F
+U+0038,U+2049,U+FE0F
+U+00AE,U+FE0F
+U+0039,U+FE0F
+U+2049,U+FE0F
+U+0038,U+20E3,U+FE0F
diff --git a/test/subset/data/tests/cmap14.tests b/test/subset/data/tests/cmap14.tests
index abfec32d9..5165f1c14 100644
--- a/test/subset/data/tests/cmap14.tests
+++ b/test/subset/data/tests/cmap14.tests
@@ -11,13 +11,22 @@ notdef-outline-name-ids.txt
 notdef-outline-gids.txt
 
 SUBSETS:
-一丂七
-丂
-七
-一七
-一丅万
-丅万丈三
-丈
-丈三
-丂七丈
+U+4E00,U+4E02,U+4E03
+U+4E02
+U+4E03
+U+4E00,U+4E03
+U+4E00,U+4E05,U+4E07
+U+4E05,U+4E07,U+4E08,U+4E09
+U+4E08
+U+4E08,U+4E09
+U+4E02,U+4E03,U+4E08
 *
+U+4E00,U+4E02,U+4E03,U+E0100
+U+4E02,U+E0100
+U+4E03,U+E0100
+U+4E00,U+4E03,U+E0100
+U+4E00,U+4E05,U+4E07,U+E0100
+U+4E05,U+4E07,U+4E08,U+4E09,U+E0100
+U+4E08,U+E0100
+U+4E08,U+4E09,U+E0100
+U+4E02,U+4E03,U+4E08,U+E0100
diff --git a/test/subset/data/tests/layout.gsub3.tests b/test/subset/data/tests/layout.gsub3.tests
index 35d02fb22..065457bdf 100644
--- a/test/subset/data/tests/layout.gsub3.tests
+++ b/test/subset/data/tests/layout.gsub3.tests
@@ -10,3 +10,7 @@ SUBSETS:
 叱
 厩叱
 *
+
+# TODO temporary until diff with fonttools on FDSelect format is fixed.
+OPTIONS:
+no_fonttools