Optimized test execution script

Change-Id: I7c6e4cf1ae9f62f861872cf573703ed9b3f57eb3
Merge "Optimized test execution script"