unit tests issues solved