Added fix for execution tests in parallel.

Change-Id: Ic0d75db5190f1ecb297a7ec946bd79d5fa35b665