Fix unit test failures

Change-Id: Ibc61ef81fafeb20df6df6e5496b6c01760f3dc84
2 files changed