Smoke Test Refactor
Merge pull request #973 from rjackson/smoke-test-refactor

Smoke Test Refactor