CLN: more plotting test cleanups
Merge pull request #4912 from cpcloud/plotting-test-cleanup

CLN: more plotting test cleanups