fixing some tests issues