diff --git a/dictsource/kl_rules b/dictsource/kl_rules
index 52210281..59c2a441 100644
--- a/dictsource/kl_rules
+++ b/dictsource/kl_rules
@@ -52,8 +52,9 @@
 
 
 .group g
-        g        j
-        gg       j:
+        g        Q
+        gg       x:
+        gg (i    C:
 
 
 .group h
@@ -74,8 +75,8 @@
 
 
 .group k
-        k        g
-        kk       g:
+        k        k
+        kk       k:
 
 
 .group l
@@ -91,6 +92,7 @@
 .group n
         n        n
 	na	 na
+	naa      na:
         nn       n:
         ng       N
         nng      N:
@@ -104,8 +106,8 @@
 
 
 .group p
-        p        b
-        p        b:
+        p        p
+        pp       p:
 
 
 .group q
@@ -124,10 +126,10 @@
 
 
 .group t
-	t        d
-	ti	 ti
-	te	 te
-	tt       d
+	t        t
+	t (i	 ts
+     i) t (_     tS;
+	tt       t:
 	tl       tl#
 	ts       ts
 
diff --git a/espeak-data/voices/test/nci b/espeak-data/voices/test/nci
new file mode 100644
index 00000000..d0864f3d
--- /dev/null
+++ b/espeak-data/voices/test/nci
@@ -0,0 +1,7 @@
+name nahuatl - classical
+language nci
+gender male
+
+intonation 3
+stressrule 2
+stressLength  190  190  200  200  0  0  220  240
diff --git a/espeak-data/voices/test/pap b/espeak-data/voices/test/pap
new file mode 100644
index 00000000..3b105a7f
--- /dev/null
+++ b/espeak-data/voices/test/pap
@@ -0,0 +1,5 @@
+name papiamento-test
+language pap
+
+phonemes base2
+