Stablize tests.

Change-Id: Iee46114ccfaf56bc923293b18773b6233fe99243