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