Fixes on test for environment variables
Fixes on test for environment variables

jgarcows/globalization,Osthanes/globalization,Osthanes/globalization,Osthanes/globalization,jgarcows/globalization,jgarcows/globalization