TST: Clean up figure tests#7765

NelleV merged 2 commits intomatplotlib:mastermatplotlib/matplotlib:masterfrom

dstansby:figure-test-cleandstansby/matplotlib:figure-test-cleanCopy head branch name to clipboard