simplified test script
Merge branch 'simplify-scripts' into develop