Updated tests accordingly.
Updated tests accordingly.

mauricemach/coffeekup,mizchi/coffeecup,mizchi/coffeecup,mizchi/coffeecup,mizchi/coffeecup,gradus/coffeecup,gradus/coffeecup,gradus/coffeecup,mauricemach/coffeekup