added mocha + expect.js fixes #6