Improved smoke test