Fixed unit-tests issues.