Updated test script
Merge branch 'v3'