Consolidate some tests and fix a couple typos#17536

Merged

efiring merged 4 commits intomatplotlib:masterfrom

QuLogic:consolidate-tests

Jun 3, 2020

Commits on May 28, 2020

Consolidate `test_figimage[01]` into a single test.
QuLogic
committed

Commits on May 29, 2020