Improved test running script
Merge branch 'v3'