diff --git a/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml b/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
index 74fb8a9f..77a3c404 100644
--- a/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
+++ b/src/fst/test/dict-gt-yamls/for_liv_yaml_2023_08_17_dict-gt-norm.gen.yaml
@@ -5678,22 +5678,22 @@ Tests:
     tēḑ+N+Pl+Ela: tēʼḑist
     
 #"N_141":{"tips":"141","vards":"lēʼḑ","vcount":"18","bloks":"N","loc":{
-    lēḑ+N+Sg+Nom: lēʼḑ
-    lēḑ+N+Sg+Gen: līʼed
-    lēḑ+N+Sg+Dat: līʼedõn
-    lēḑ+N+Sg+Par: līʼedtõ
-    lēḑ+N+Sg+Ins: līʼedkõks
-    lēḑ+N+Sg+Ill: līʼedõ
-    lēḑ+N+Sg+Ine: līʼedsõ
-    lēḑ+N+Sg+Ela: līʼedstõ
-    lēḑ+N+Pl+Nom: līʼedõd
-    lēḑ+N+Pl+Gen: līʼedõd
-    lēḑ+N+Pl+Dat: līʼedõdõn
-    lēḑ+N+Pl+Par: lēʼḑi
-    lēḑ+N+Pl+Ins: līʼedõdõks
-    lēḑ+N+Pl+Ill: lēʼḑiž
-    lēḑ+N+Pl+Ine: lēʼḑis
-    lēḑ+N+Pl+Ela: lēʼḑist
+    lēḑ+Hom3+N+Sg+Nom: lēʼḑ
+    lēḑ+Hom3+N+Sg+Gen: līʼed
+    lēḑ+Hom3+N+Sg+Dat: līʼedõn
+    lēḑ+Hom3+N+Sg+Par: līʼedtõ
+    lēḑ+Hom3+N+Sg+Ins: līʼedkõks
+    lēḑ+Hom3+N+Sg+Ill: līʼedõ
+    lēḑ+Hom3+N+Sg+Ine: līʼedsõ
+    lēḑ+Hom3+N+Sg+Ela: līʼedstõ
+    lēḑ+Hom3+N+Pl+Nom: līʼedõd
+    lēḑ+Hom3+N+Pl+Gen: līʼedõd
+    lēḑ+Hom3+N+Pl+Dat: līʼedõdõn
+    lēḑ+Hom3+N+Pl+Par: lēʼḑi
+    lēḑ+Hom3+N+Pl+Ins: līʼedõdõks
+    lēḑ+Hom3+N+Pl+Ill: lēʼḑiž
+    lēḑ+Hom3+N+Pl+Ine: lēʼḑis
+    lēḑ+Hom3+N+Pl+Ela: lēʼḑist
     
 #"N_142":{"tips":"142","vards":"kīntš","vcount":"2","bloks":"N","loc":{
     kīntš+N+Sg+Nom: kīntš
@@ -6326,22 +6326,22 @@ Tests:
     äggõz+N+Pl+Ela: äʼggist
     
 #"N_172ʼ":{"tips":"172ʼ","vards":"pūʼdõz","vcount":"58","bloks":"N","loc":{
-    pūdõz+N+Sg+Nom: pūʼdõz
-    pūdõz+N+Sg+Gen: pūʼdõ
-    pūdõz+N+Sg+Dat: pūʼdõn
-    pūdõz+N+Sg+Par: pūʼdõzt
-    pūdõz+N+Sg+Ins: pūʼdõks
-    pūdõz+N+Sg+Ill: [pūʼdõ, pūʼdõz]
-    pūdõz+N+Sg+Ine: pūʼdõs
-    pūdõz+N+Sg+Ela: pūʼdõst
-    pūdõz+N+Pl+Nom: pūʼdõd
-    pūdõz+N+Pl+Gen: pūʼdõd
-    pūdõz+N+Pl+Dat: pūʼdõdõn
-    pūdõz+N+Pl+Par: pūʼdidi
-    pūdõz+N+Pl+Ins: pūʼdõdõks
-    pūdõz+N+Pl+Ill: pūʼdiž
-    pūdõz+N+Pl+Ine: pūʼdis
-    pūdõz+N+Pl+Ela: pūʼdist
+    pūdõz+A+Sg+Nom: pūʼdõz
+    pūdõz+A+Sg+Gen: pūʼdõ
+    pūdõz+A+Sg+Dat: pūʼdõn
+    pūdõz+A+Sg+Par: pūʼdõzt
+    pūdõz+A+Sg+Ins: pūʼdõks
+    pūdõz+A+Sg+Ill: [pūʼdõ, pūʼdõz]
+    pūdõz+A+Sg+Ine: pūʼdõs
+    pūdõz+A+Sg+Ela: pūʼdõst
+    pūdõz+A+Pl+Nom: pūʼdõd
+    pūdõz+A+Pl+Gen: pūʼdõd
+    pūdõz+A+Pl+Dat: pūʼdõdõn
+    pūdõz+A+Pl+Par: pūʼdidi
+    pūdõz+A+Pl+Ins: pūʼdõdõks
+    pūdõz+A+Pl+Ill: pūʼdiž
+    pūdõz+A+Pl+Ine: pūʼdis
+    pūdõz+A+Pl+Ela: pūʼdist
     
 #"N_174":{"tips":"174","vards":"vīetšõz","vcount":"6","bloks":"N","loc":{
     vīetšõz+N+Sg+Nom: vīetšõz