Smoke Test Refactor