Fix mocha tests with CS 1.7