move test framework support into plugin system
Merge