diff --git a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
index 6d52af06..857ca949 100644
--- a/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
+++ b/android/eSpeakTests/src/com/reecedunn/espeak/test/VoiceData.java
@@ -87,9 +87,11 @@ public class VoiceData
         new Voice("en-us",       "en/en-us", "en",  "eng", "US",  "USA", "",         SpeechSynthesis.GENDER_MALE,        "English (US)"),
         new Voice("en-wi",       "en/en-wi", "en",  "eng", "029", "",    "",         SpeechSynthesis.GENDER_MALE,        "English (Caribbean)"),
         new Voice("eo",          "eo",       "eo",  "epo", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Esperanto"),
+        new Voice("es",          "es",       "es",  "spa", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Spanish"),
         new Voice("es-la",       "es-la",    "es",  "spa", "419", "",    "",         SpeechSynthesis.GENDER_MALE,        "Spanish (Latin America & Caribbean)"),
         new Voice("et",          "et",       "et",  "est", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Estonian"),
         new Voice("fi",          "fi",       "fi",  "fin", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Finnish"),
+        new Voice("fr-be",       "fr-be",    "fr",  "fra", "BE",  "BEL", "",         SpeechSynthesis.GENDER_MALE,        "French (Belgium)"),
         new Voice("fr-fr",       "fr",       "fr",  "fra", "FR",  "FRA", "",         SpeechSynthesis.GENDER_MALE,        "French (France)"),
         new Voice("ga",          "test/ga",  "ga",  "gle", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Irish"),
         new Voice("grc",         "test/grc", "grc", "grc", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Greek (Ancient)"),
@@ -112,6 +114,7 @@ public class VoiceData
         new Voice("la",          "la",       "la",  "lat", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Latin"),
         new Voice("lt",          "test/lt",  "lt",  "lit", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Lithuanian"),
         new Voice("lv",          "lv",       "lv",  "lav", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Latvian"),
+        new Voice("mk",          "mk",       "mk",  "mkd", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Macedonian"),
         new Voice("ml",          "ml",       "ml",  "mal", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Malayalam"),
         new Voice("mt",          "test/mt",  "mt",  "mlt", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Maltese"),
         new Voice("nci",         "test/nci", "nci", "",    "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Classical Nahuatl"),
@@ -121,6 +124,7 @@ public class VoiceData
         new Voice("nso",         "test/nso", "nso", "nso", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Sotho (Northern)"),
         new Voice("pa",          "test/pa",  "pa",  "pan", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Panjabi"),
         new Voice("pap",         "test/pap", "pap", "pap", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Papiamento"),
+        new Voice("pl",          "pl",       "pl",  "pol", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Polish"),
         new Voice("prs",         "test/prs", "prs", "",    "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Dari (Afghan Persian)"),
         new Voice("pt-br",       "pt",       "pt",  "por", "BR",  "BRA", "",         SpeechSynthesis.GENDER_MALE,        "Portuguese (Brazil)"),
         new Voice("pt-pt",       "pt-pt",    "pt",  "por", "PT",  "PRT", "",         SpeechSynthesis.GENDER_MALE,        "Portuguese (Portugal)"),
@@ -133,6 +137,7 @@ public class VoiceData
         new Voice("sq",          "sq",       "sq",  "sqi", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Albanian"),
         new Voice("sr",          "sr",       "sr",  "srp", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Serbian"),
         new Voice("sv",          "sv",       "sv",  "swe", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Swedish"),
+        new Voice("sw",          "sw",       "sw",  "swa", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Swahili"),
         new Voice("ta",          "ta",       "ta",  "tam", "",    "",    "",         SpeechSynthesis.GENDER_MALE,        "Tamil"),
         new Voice("te",          "test/te",  "te",  "tel", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Telugu"),
         new Voice("tn",          "test/tn",  "tn",  "tsn", "",    "",    "",         SpeechSynthesis.GENDER_UNSPECIFIED, "Setswana"),