consolidate run-test script
merge branch-0.3 branch