Updated to account for refactorings in the PUC Plugin API
more updates to handle PUC Plugin refactorings, fixed unit tests