Another try to fix mocha tests