Manjyot, Lokesh| Fixing smoketests