Remove coffee option (for now) and fix tests