First pass reordering of test scripts

First pass reordering of test scripts