improved Windows support for 'npm test'
Merge pull request #840 from mcandre/master

Improved Windows support for `npm test`