Manjyot, Lokesh| Fixing Smoke tests