Mock urllib3 instead of requests
Minor refactorings
Merge transition to urllib3