Fixing broken unit tests.

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