more mocha test changes