Fix NVM_DIR discovery
Merge pull request #374 from koenpunt/fix-tests

 Fix NVM_DIR discovery