diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.cpg b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.cpg
new file mode 100755
index 0000000000000000000000000000000000000000..3ad133c048f2189041151425a73485649e6c32c0
--- /dev/null
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.cpg
@@ -0,0 +1 @@
+UTF-8
\ No newline at end of file
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.dbf b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.dbf
new file mode 100755
index 0000000000000000000000000000000000000000..5ff7481316adb67aea5acf51fe2645bba5315090
Binary files /dev/null and b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.dbf differ
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.prj b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.prj
new file mode 100755
index 0000000000000000000000000000000000000000..5c6f76df8b8d4714351777d7c661b9b893a67027
--- /dev/null
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.prj
@@ -0,0 +1 @@
+PROJCS["WGS_1984_Web_Mercator_Auxiliary_Sphere",GEOGCS["GCS_WGS_1984",DATUM["D_WGS_1984",SPHEROID["WGS_1984",6378137.0,298.257223563]],PRIMEM["Greenwich",0.0],UNIT["Degree",0.0174532925199433]],PROJECTION["Mercator_Auxiliary_Sphere"],PARAMETER["False_Easting",0.0],PARAMETER["False_Northing",0.0],PARAMETER["Central_Meridian",0.0],PARAMETER["Standard_Parallel_1",0.0],PARAMETER["Auxiliary_Sphere_Type",0.0],UNIT["Meter",1.0]]
\ No newline at end of file
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp
new file mode 100755
index 0000000000000000000000000000000000000000..9fcbadbc14542a9ceb508a7dbab676c9d2a8de2d
Binary files /dev/null and b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp differ
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shx b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shx
new file mode 100755
index 0000000000000000000000000000000000000000..e7b60c7395dfefa43d610a6388d9930cbed13e29
Binary files /dev/null and b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shx differ
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/logos_Ethiopia_plotting.png b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/logos_Ethiopia_plotting.png
new file mode 100644
index 0000000000000000000000000000000000000000..f6d7a41a698089ce5e6c84c1a50b78556a0f9009
Binary files /dev/null and b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/logos_Ethiopia_plotting.png differ
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/configs/config_EastAfrica_variety_names_tidy.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/configs/config_EastAfrica_variety_names_tidy.json
new file mode 100644
index 0000000000000000000000000000000000000000..9b00940e79ce5151988896e306acfbe727d44866
--- /dev/null
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/configs/config_EastAfrica_variety_names_tidy.json
@@ -0,0 +1,687 @@
+{
+    "16THSRRSN #6126":
+    [
+        "16THSRRSN#6126"
+    ],
+    "15th stemrust": 
+    [
+        "15th stemrust"
+    ],
+    "AAAFC CANADA#162": 
+    [
+        "AAAFC CANADA#162"
+    ],
+    "Alidoro": 
+    [
+        "Alidoro"
+    ],
+    "Amibara 2":
+    [
+        "Amibara_2"
+    ],
+    "Boru": 
+    [
+        "Boru"
+    ],
+    "Bulala": 
+    [
+        "Bulala"
+    ],
+    "CD 21 #16815": 
+    [
+        "CD 21 # 16815"
+    ],
+    "CD 21 #16296": 
+    [
+        "CD 21 #16296"
+    ],
+    "CD 22 #761 - ELTSR":
+    [
+        "CD22#761 -ELTSR"
+    ],
+    "Daka": 
+    [
+        "Daka",
+        "Deka"
+    ],
+    "Dambal": 
+    [
+        "Dambal",
+        "Dambel"
+    ],
+    "Damphe": 
+    [
+        "Damphe",
+        "Danfe",
+        "Denfe"
+    ],
+    "Danda'a": 
+    [
+        "Danda'a",
+        "danda'",
+        "danda'a",
+        "Danda,a",
+        "Dandaha",
+        "Dandea",
+        "Dend",
+        "Denda",
+        "Denda'a",
+        "denda, a",
+        "Dendaa",
+        "Dende' a",
+        "Dende'a",
+        "Dendea",
+        "Dendy",
+        "Debdea"
+    ],
+    "Db1899": 
+    [
+        "Db1899"
+    ],
+    "Deneba": 
+    [
+        "Deneba"
+    ],
+    "Digalu": 
+    [
+        "Digalu",
+        "Digelu"
+    ],
+    "Duma":
+    [
+        "Duma"
+    ],
+    "Durum CD21 ELTSR #1382": 
+    [
+        "Durum CD21 ELTSR#1382"
+    ],
+    "Eagle 10": 
+    [
+        "Eagle 10"
+    ],
+    "Eldo Baraka": 
+    [
+        "Eldo Baraka"
+    ],
+    "ELITE BW #6":
+    [
+        "ELITE BW#6"
+    ],
+    "ELITE BW #13":
+    [
+        "ELITEBW 13",
+        "ELITEBW  13"
+    ],
+    "ELITE BW #14":
+    [
+        "ELITEBW  14",
+        "ELITEBW 14"
+    ],
+    "ELITE BW #21":
+    [
+        "ELITEBW-KENYA#21"
+    ],
+    "Enikoy": 
+    [
+        "Enikoy",
+        "Enkoy"
+    ],
+    "EPCBW #122": 
+    [
+        "EPCBW#122",
+        "EPCBW #122",
+        "EPCBW  #122"
+    ],
+    "EPCBW #207": 
+    [
+        "EPCBW#207",
+        "EPCBW #207",
+        "EPCBW  #207"
+    ],
+    "EPCBW #320": 
+    [
+        "EPCBW#320",
+        "EPCBW #320",
+        "EPCBW  #320"
+    ],
+    "EPCBW #1002": 
+    [
+        "EPCBW#1002",
+        "EPCBW #1002",
+        "EPCBW  #1002"
+    ],
+    "EPCHPLUS # KEN#58": 
+    [
+        "EPCHPLUS # KEN#58"
+    ],
+    "EPCHPLUS #154": 
+    [
+        "EPCHPLUS#154"
+    ],
+    "EPCHPLUS- KEN#120": 
+    [
+        "EPCHPLUS- KEN#120"
+    ],
+    "EPCHPZN #11" :
+    [
+        "EPCHPZN#11"
+    ],
+    "Et 13": 
+    [
+        "Et 13",
+        "ET13",
+        "Et13",
+        "Ey13"
+    ],
+    "ETHIOPIA  #238": 
+    [
+        "ETHIOPIA  #238"
+    ],
+    "F2BW #14" :
+    [
+        "F2BW#14"
+    ],
+    "F2BW #57" :
+    [
+        "F2BW#57"
+    ],
+    "F2HPZN #156":
+    [
+        "F2HPZN # 156"
+    ],
+    "F2HPZN #38" :
+    [
+        "F2HPZN#38"
+    ],
+    "F2HPLUS-KEN #111": 
+    [
+        "F2HPLUS-KEN #111"
+    ],
+    "F3BW #9" :
+    [
+        "F3BW#9"
+    ],
+    "F3BW #360": 
+    [
+        "F3BW   #360"
+    ],
+    "F3HPLUS- KEN #59": 
+    [
+        "F3HPLUS- KEN #59"
+    ],
+    "F3HPZN #59" :
+    [
+        "F3HPZN#59"
+    ],
+    "F4 HPLUS KEN": 
+    [
+        "F4 HPLUS KEN"
+    ],
+    "F5RG #357" :
+    [
+        "F5RG#357"
+    ],
+    "F5 RG BW (A) #73": 
+    [
+        "F5 RG BW (A)#73"
+    ],
+    "F5RG (A) #336": 
+    [
+        "F5RG (A)#336"
+    ],
+    "F5RG (A) #757": 
+    [
+        "F5RG (A)#757"
+    ],
+    "F5RG (B) #1026": 
+    [
+        "F5RG (B) #1026"
+    ],
+    "F5RGBW #181 (A)": 
+    [
+        "F5RGBW#181 (A)"
+    ],
+    "Farasi": 
+    [
+        "Farasi"
+    ],
+    "Farlly": 
+    [
+        "Farlly"
+    ],
+    "Fentale-2": 
+    [
+        "Fentale-2",
+        "Fentale_2"
+    ],
+    "Galane": 
+    [
+        "Galane",
+        "Gelan"
+    ],
+    "Genotypes": 
+    [
+        "Genotypes"
+    ],
+    "Grace": 
+    [
+        "Grace"
+    ],
+    "Hachalu": 
+    [
+        "Hachalu"
+    ],
+    "Hidassie": 
+    [
+        "Hidassie",
+        "Hidasse",
+        "Hidase",
+        "Hidasie",
+        "hidassie",
+        "Hiddasie",
+        "Hisasie",
+        "Hisasse"
+    ],
+    "HR1685": 
+    [
+        "HR1685"
+    ],
+    "Huluka": 
+    [
+        "Huluka",
+        "Huluqa"
+    ],
+    "Hyrax": 
+    [
+        "Hyrax"
+    ],
+    "Improved": 
+    [
+        "Improved"
+    ],
+    "Iran#66": 
+    [
+        "Iran#66"
+    ],
+    "Israel": 
+    [
+        "Israel"
+    ],
+    "Jacana": 
+    [
+        "Jacana",
+        "JACANA"
+    ],
+    "K. Korongo": 
+    [
+        "K. Korongo",
+        "K. Korongo ",
+        "Korongo",
+        "Korongo "
+    ],
+    "KS. Chui": 
+    [
+        "Chui",
+        "KS. Chui",
+        "KS.CHUI",
+        "KS.Chui"
+    ],
+    "K624A": 
+    [
+        "K624A",
+        "K62 4A"
+    ],
+    "K924A": 
+    [
+        "K924A"
+    ],
+    "Kakaba": 
+    [
+        "Kakab",
+        "Kakaba",
+        "Kekeaba",
+        "Kekeb",
+        "KEKEBA",
+        "Kekeba",
+        "kekeba",
+        "Kekebw"
+    ],
+    "Kebaba": 
+    [
+        "Kebaba"
+    ],
+    "Kenya Impala": 
+    [
+        "Kenya Impala"
+    ],
+    "Kenya Kasuku": 
+    [
+        "Kenya Kasuku",
+        "Kasuku",
+        "KASUKU"
+    ],
+    "Kenya Pweza": 
+    [
+        "Kenya Pweza"
+    ],
+    "Kenya Turaco": 
+    [
+        "Kenya Turaco"
+    ],
+    "Kenya wren": 
+    [
+        "Kenya wren"
+    ],
+    "Kingbird": 
+    [
+        "Kingbird",
+        "King Bird",
+        "King bird",
+        "Kingbirds"
+    ],
+    "Kubsa": 
+    [
+        "Kubsa",
+        "kubsa",
+        "Kubssa"
+    ],
+    "Kwale": 
+    [
+        "Kwale",
+        "Kwale "
+    ],
+    "Lemu": 
+    [
+        "Lemu"
+    ],
+    "Liben": 
+    [
+        "Liben"
+    ],
+    "Local": 
+    [
+        "Local",
+        "From local market(Unknown)"
+    ],
+    "Mangudo": 
+    [
+        "Mangudo",
+        "mangudo"
+    ],
+    "Mixed": 
+    [
+        "Mixed",
+        "Digalu mixture with Hidasie",
+        "Kingbird (mixed)",
+        "mixed",
+        "Mixed variety",
+        "Hidassie with danda'a",
+        "Kingbird, wane ogolchoo",
+        "israel+Et 13",
+        "Mixed (Njoro II, Uknown)",
+        "Mixed crop  (Njoro II & Korongo )",
+        "Mixed crop  (Njoro II & Korongo)",
+        "Mixed crop ( Kwale& unknown )",
+        "Mixed crop (Korongo & KS. Chui)",
+        "Mixed crop (Korongo & KS.CHUI )",
+        "Mixed crop (KS.CHUI &Eagle 10)",
+        "Mixed crop (Kwale & unknown )",
+        "Mixed crop (Kwale& Njoro II )",
+        "Mixed crop (Njoro II & KS.CHUI )",
+        "Mixed crop (Njoro II & unknown )",
+        "Mixed crop (Njoro II& Korongo )"
+    ],
+    "Mwamba": 
+    [
+        "Mwamba"
+    ],
+    "Ndume": 
+    [
+        "Ndume",
+        "Ndume "
+    ],
+    "NJORO BW II": 
+    [
+        "NJORO BW II",
+        "Njoro BW II",
+        "NJORO BW II ",
+        "Njoro 2",
+        "Njoro BW Il",
+        "Njoro BWIl",
+        "NJORO BWIl ",
+        "NjoroBWII",
+        "NjoroBWII ",
+        "Njoro Il"
+    ],
+    "Ogolcho": 
+    [
+        "Ogelcho",
+        "Oglcho",
+        "Ogocho",
+        "Ogol cho",
+        "Ogolchi",
+        "OGOLCHO",
+        "Ogolcho",
+        "ogolcho",
+        "Ogolicho",
+        "OGOLOCHO",
+        "Ogilcho",
+        "Ogolch",
+        "Ogolucho"
+    ],
+    "One": 
+    [
+        "One"
+    ],
+    "Otuba": 
+    [
+        "Otuba",
+        "Utuba"
+    ],
+    "Paven 76": 
+    [
+        "Paven 76",
+        "Paven76",
+        "Pavo-76",
+        "Pavon",
+        "Pavan",
+        "Pavon_76"
+    ],
+    "PCBW #560": 
+    [
+        "PCBW# 560"
+    ],
+    "PCBW #1387" :
+    [
+        "PCBW#1387"
+    ],
+    "PCBW #1877": 
+    [
+        "PCBW#1877"
+    ],
+    "PCBW #4175" :
+    [
+        "PCBW#4175"
+    ],
+    "PCBW #4556" :
+    [
+        "PCBW#4556"
+    ],
+    "PCBWSR #2431": 
+    [
+        "PCBWSR#2431"
+    ],
+    "PCBWSR #3421": 
+    [
+        "PCBWSR#3421"
+    ],
+    "PCBWSR #4409": 
+    [
+        "PCBWSR4409"
+    ],
+    "PCHZNSR #585" :
+    [
+        "PCHZNSR #585"
+    ],
+    "PCHPLUSSR #198": 
+    [
+        "PCHPLUSSR#198"
+    ],
+    "Robin": 
+    [
+        "Robin"
+    ],
+    "Senate": 
+    [
+        "Sanate",
+        "Senate"
+    ],
+    "Shorima": 
+    [
+        "SHORIMA",
+        "Shorima",
+        "Shorimo",
+        "Shoroma"
+    ],
+    "Simba": 
+    [
+        "Simba",
+        "Sinba"
+    ],
+    "SR DIFFERENTIAL  #27": 
+    [
+        "SR DIFFERENTIAL  # 27",
+        "Sr differentials #27"
+
+    ],
+    "SR DIFFERENTIAL  #51": 
+    [
+        "SR DIFFERENTIAL  # 51",
+        "SR Differential#51"
+    ],
+    "SR DIFFERENTIAL #33": 
+    [
+        "Sr differential #33"
+    ],
+    "SR DIFFERENTIAL #20": 
+    [
+        "SR Differentials#20"
+    ],
+    "Sydney Australia #83": 
+    [
+        "Sydney Australia #83"
+    ],
+    "Tsehay": 
+    [
+        "Tsehay"
+    ],
+    "Unknown": 
+    [
+        "Unknown",
+        "Uknown",
+        "Uknown ",
+        "unknown",
+        "Unknown ",
+        "Unkoown",
+        "Unkown",
+        "unkown",
+        "Unkwon",
+        "Unkwown"
+    ],
+    "USDA #105": 
+    [
+        "USDA#105"
+    ],
+    "USDA #112": 
+    [
+        "USDA#112"
+    ],
+    "USDA #547": 
+    [
+        "USDA#547"
+    ],
+    "USDA #747": 
+    [
+        "USDA#747"
+    ],
+    "USDA #823": 
+    [
+        "USDA#823"
+    ],
+    "USDA #994": 
+    [
+        "USDA#994",
+        "USDA #994"
+    ],
+    "USDA #1061": 
+    [
+        "USDA#1061",
+        "USDA #1061"
+    ],
+    "USDA #1135": 
+    [
+        "USDA#1135",
+        "USDA #1135"
+    ],
+    "USDA #1458": 
+    [
+        "USDA#1458",
+        "USDA #1458"
+    ],
+    "USDA #1588": 
+    [
+        "USDA#1588",
+        "USDA #1588"
+    ],
+    "USDA #1612": 
+    [
+        "USDA #1612"
+    ],
+    "USDA #1762": 
+    [
+        "USDA#1762"
+    ],
+    "Wane": 
+    [
+        "Wane",
+        "Wanie"
+    ],
+    "YR DIFFERENTIAL #1": 
+    [
+        "YR DIFFERENTIAL#1",
+        "YR DIFFERENTIAL #1"
+    ],
+    "YR DIFFERENTIAL #8": 
+    [
+        "YR DIFFERENTIAL#8",
+        "YR DIFFERENTIAL #8"
+    ],
+    "YR DIFFERENTIAL #10": 
+    [
+        "YR DIFFERENTIAL#10",
+        "YR DIFFERENTIAL #10"
+    ],
+    "YR DIFFERENTIAL #15": 
+    [
+        "YR DIFFERENTIAL#15",
+        "YR DIFFERENTIAL #15"
+    ],
+    "YR DIFFERENTIAL #24": 
+    [
+        "YR DIFFERENTIAL#24",
+        "YR DIFFERENTIAL #24"
+    ],
+    "YR DIFFERENTIAL #27": 
+    [
+        "YR DIFFERENTIAL#27",
+        "YR DIFFERENTIAL #27"
+    ],
+    "YR27/6*AOC": 
+    [
+        "YR27/6*AOC"
+    ],
+    "YR8/6*AOC": 
+    [
+        "YR8/6*AOC"
+    ]
+}
\ No newline at end of file
diff --git a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
index b0505980ddfcc5f086b2a6c21ebdeeadc327623c..e74901c557e7c24ff2f06745084dbf4dd6599ca8 100644
--- a/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
+++ b/tests/test_data/test_deployment/regions/EastAfrica/resources/coordinator/configs/config_EastAfrica_fc_live.json
@@ -274,13 +274,13 @@
             "CountryColumnName" : "surveyor_infromation-country",
             "EastAfrica" : {
                 "ShapeFilenameAdmin0" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp",
-                "ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin1.shp",
-                "ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin2.shp"
+                "ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp",
+                "ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp"
             },
             "Ethiopia" : {
-                "ShapeFilenameAdmin0" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_Region_2013.shp",
-                "ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_ADM1_EN.shp",
-                "ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/Eth_Woreda_2013.shp"
+                "ShapeFilenameAdmin0" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp",
+                "ShapeFilenameAdmin1" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp",
+                "ShapeFilenameAdmin2" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/EthKen_admin0.shp"
             }
         },
         "logos" : "../test_data/test_deployment/regions/EastAfrica/resources/advisory_builder/assets/logos_Ethiopia_plotting.png"