make test cleanup reliable