It's finished. Also modified the test script