TOOLS-455: add back smoke.py updates