Fix unit tests issues