Stablize tests.

Change-Id: If1a7189d7b0be734a247457869aecb547e0adca1