reorganizing test scripts