Improved test coverage, added smoker calculation