Updated Smoke Test