restructured test scripts