Stablize tests.

Change-Id: I5dd0947ec388499f2de32e0041f74abc1baad1c1