Refactor Test / Coffee