spork nd tests
Merge pull request #1196 from shackbarth/ndtest

spork nd tests