some changes in Mocha tests