TOOLS-202 bring tests up to date with new directory structure, add env variable to smoke.py