Improves test coverage

There is no easy way to put this, but the test coverage for this plugin is egregious.  I've opened this PR to help get it back in the right direction.