CLN: more plotting test cleanups

Just a couple of cleanups here and there

Adds a new decorator to skip matplotlib in a class method