Improved ServeCoffeeTest