Update to work with 1.0 and mocha test runner.