1. code improvement
2. modify test script