a bit more smoke test cleanup