Fixed unit testcases as per the changes in the last patch.

Signed-off-by: Sateesh Kavuri <sateesh@mobilitas.co>