Fix more unittests.

Change-Id: I91a4dd1d39e01f174e1aaae653ce1ed7aecaa624