improve the tearDown method as it was contaminating the global config
Merge pull request #186 from alfredodeza/env_var

improve the tearDown method as it was contaminating the global config
Merge remote-tracking branch 'upstream/next' into next