Minor unit test fixes.

Change-Id: I800bb33a10f31d5b934b00768bc8fe4776e36f90
2 files changed