continuing refactoring, adding plugins tests