Remove non-portable assumptions about directory structure
Merge pull request #238 from pfmoore/directory_tests

Remove non-portable assumptions about directory structure