Fix tests.

Change-Id: Id9032918ebc195b3ab4131ebb2cc10a279bfbc70