improve test scripts
hopefully fix all the test scripts