Stablize tests.

Change-Id: I2a3ebfa9529e1ea2ab77ea0aa7bb316850ea28ef