refactored smoke distribution tests