Updates for py3 mock_requests compatibility