Update tests - use mocha-runner to work an mac & win