Cleanup a bit more references so test_urllibnet is stable (test_urllib2 is sometimes stable, at least in isolation)