Make mocha tests pass again