Improved test cleanup for environment-variable-based configuration.
Merge pull request #197 from ryanpetrello/environment-variable-patch

Improved test cleanup for environment-variable-based configuration.