Merge pull request #251 from garyburd/issue250

Imporve handling of testdata directories