Manjyot, Lokesh| Fixing smoke tests