Update urllib3 to df4ec5cce1
Add last few changes and add a quick test