Main test data download updates

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

Main test data download updates
First pass reordering of test scripts

First pass reordering of test scripts
Merge pull request #99 from mfunk/master

First pass reordering of test scripts