Made the plugins a little better.
Merge remote-tracking branch 'origin/test-coverage-bettering' into test-coverage-bettering