Fix unit tests.

Change-Id: I3d4a882568f532a2c1ada32ce369e934e0a4e74f