More test setup script changes.

Change-Id: I551ffa6c65886e270596e1c7205ec26fa2a62b24