Wizards refactoring
jacoco it coverage