Tests: Fixutres fixes for coffee and iced-coffee.
Merge pull request #1335 from am11/master

Tests: Fixutres fixes for coffee and iced-coffee