Updated tests to fix intermittent webmock-related failures.