Fixed tests issues