Yogesh/Pooja | #0000 | Smoke test fix