ticket:9 added tests + updates for barista