Make it work for test script v6