Add a new, still failing, acceptance test
Reorganize coffee file