Starting to fix mocha tests