Fixing some tests issues