Remove coffee option (for now) and fix tests
Merge pull request #11 from kevva/tests

Remove coffee option (for now) and fix tests