Smoke test support updates