Test setup scripts enhancements.

Change-Id: Icd1d3ca863ed7783c06f42a102ead74246aa02e5