rewriting tests to mocha, coverage provided by istanbul
merge