Make it work for test script v2