Ashwin/Ajay | #2481 | Fixing smoke test.