Better test cleanup