Improve script
Improve test script