Improve run test script