WIP - Smoke Test Refactor