Coffee fix2

Fixed CLA issues (I think), and added additional commits to comply with @bajtos requests.
This line won't be called when the test fails (an error is thrown). Please extract it to an `afterEach` block.