Fix tests.

Change-Id: Ief741beaaef7a39a8b861d5763af7ff85f634e6b