Fix UVE unit test cases.

Change-Id: I201f8f30a7db151ba7751994ca2323ba756d77be
Merge "Fix UVE unit test cases."