Beverage testing and fixes