Mostly work on getting tests working again.
Using 'requests' for long-running test now.
More 'requests' switching.