Main test data download updates

Main test data download updates
Merge pull request #98 from mfunk/master

Main test data download updates