Updated test data locations

Updated test data locations
Added additional folders w placeholder.txt
Merge pull request #28 from mfunk/master

Updates for test data and folder locations