Reduce the number of test-suite DeprecationWarnings; start adding
resetwarnings() calls too.
3 files changed