Improve runtime configuration cleanup for tests.
More cleanup for configuration resetting.
Merge pull request #201 from ryanpetrello/next

Improve runtime configuration cleanup for tests.