major fixes for tests and fox for hanging client
Merge branch 'master' of github.com:abhardwaj/barista