Added smoke test support