Various gui & test script tweaks.

Change-Id: I62d8c560d4d533cd6d38ee9388a2a2e0400f51a2
8 files changed