Revert "Make sure the tests clean up after themselves"

This reverts commit 05a5cdde84d37774cccd11b6fea73a8eef8551ba.