NMS-6847 make the smoke tests more resilient