Fixing broken unit tests.

Change-Id: Ifaad09587ca2f6209a8ae94d660970104b960b61
Signed-off-by: Alex Fan <railor33@gmail.com>