More refactorings. Commented out the plugin tests for now. They seem to wreak havoc with a lot of other tests (especially validator tests) and i havent found the reason yet.