Feature/mocha 2.x

converted tests to use mocha