Still can't reproduce Drew's test failures -- add more careful inter-test cleanup