- fix broken build with latest CDO.
- refactoring test plugins.