Fix test script
Merge branch 'fix-test-script'