80bff41 more mock.patch cleanup

Authored and Committed by mikem 2 years ago
    more mock.patch cleanup