Refactor
Add test plugins