Melanie/Pooja | #0000 | reverting smoke test driver