Smoke test improvements