Tests: Fixutres fixes for coffee and iced-coffee