Stablize tests.

Change-Id: I68fdcabd062968604ed38fd371e70d03090b0dba