Cleanup a little better after tests to avoid cross-test issues