Drink and DrinkInfo test changes