Made test scripts more portable