Reorganize test suite to encapsulate repetative work

No changes to the the plugin itself, just to the test suite.
Trivial changes, but perhaps easier to read, and hopefully easier to augment with new tests later.

Feel free to reject for superfluousness.