Simplify post-test cleanup.
Merge pull request #709 from mapbox/testcleanup

Simplify post-test cleanup