Fixed unit-tests issues.

WHAT IVE DONE