Make it work for test script v1