Small bugfixes encountered during test refactoring
Feature tweak to match refactored plugin
Refactored the test architecture so it no longer uses hardcoded paths