some generic test stuff
merge
move all tests to use BaseTests
more plugintest chaos