Change test scripts to always wait for previous command to finish