Fix unit tests.

Change-Id: I7706db4c9279488552ea5fabc16dd1dd2bc7fa05
2 files changed