Fixed parallel execution for tests.

Change-Id: I83f1bcbfd1c1ef6ad3463f00aa1fd199c5399d5e